2210 Commits

Author SHA1 Message Date
Greg Wilkins
252933891c Merge branch 'master' into pathresource
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
2014-07-31 14:05:26 +10:00
Joakim Erdfelt
cb42ef2167 [maven-release-plugin] prepare for next development iteration 2014-07-23 11:18:01 -07:00
Joakim Erdfelt
dc62cb5ac7 [maven-release-plugin] prepare release jetty-9.2.2.v20140723 2014-07-23 11:17:55 -07:00
Greg Wilkins
3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Greg Wilkins
e199b671bb 440020 Abort bad proxy responses with sendError(-1) 2014-07-23 16:31:19 +10:00
Greg Wilkins
564ffca5dc 440114 ContextHandlerCollection does not skip context wrappers 2014-07-23 15:23:35 +10:00
Simone Bordet
4daba1ba79 Restored IteratingCallback APIs (in particular the completed()
method) to keep compatibility over micro versions of Jetty.

Removed getState() - can't return a private class from a protected
method, plus it was only used in a toString() with the wrong
formatting string, that was already printing the state.

Removed also final modifiers to keep compatibility.
2014-07-22 19:32:13 +02:00
Simone Bordet
cae4204150 440020 - ProxyServlet does not handle correctly failure after committed response to client.
Fixed by introducing a request attribute "org.eclipse.jetty.server
.Response.failure" used by HttpChannel to immediately close the
connection when it sees it.
2014-07-21 16:48:21 +02:00
Greg Wilkins
c72649e150 435653 encode async dispatched requestURI 2014-07-19 18:55:02 +10:00
Greg Wilkins
b38a978eac 439067 Improved graceful stop timeout handling 2014-07-19 00:46:55 +10:00
Greg Wilkins
30fcce1cdc 434536 Improved Customizer javadoc 2014-07-18 12:18:29 +10:00
Greg Wilkins
a89419fd3f 434536 Improved Customizer javadoc 2014-07-17 16:09:42 +10:00
Greg Wilkins
a2a333ba53 435653 encode async dispatched requestURI 2014-07-17 15:51:22 +10:00
Greg Wilkins
2d52280179 436987 limited range of default acceptors and selectors 2014-07-17 14:29:58 +10:00
Greg Wilkins
b13be9cfa6 438327 Remove hard coded Allow from OPTIONS * 2014-07-17 13:40:21 +10:00
Greg Wilkins
6bc08000c7 439066 javadoc setStopAtShutdown 2014-07-17 13:29:54 +10:00
Greg Wilkins
94ac37f8c2 439067 Javadoc for graceful server stop 2014-07-17 13:29:54 +10:00
Greg Wilkins
3a5e67ce9e Making ShutdownThread actually stop 2014-07-17 10:50:54 +10:00
Greg Wilkins
591eedcb59 [FindBugs] Include explicit typing whereever possible
+ No cleanup regarding unchecked types (yet)
2014-07-17 10:47:49 +10:00
Greg Wilkins
0c66f3a68e [FindBugs] Ensure resources are closed/freed properly
Removing dumb connector.close during server.getURI()
2014-07-17 10:00:26 +10:00
Greg Wilkins
ec310dca90 Fixes to Hash Sessions for 'Stream Closed' errors 2014-07-17 09:45:12 +10:00
Greg Wilkins
c19a14a4a2 [FindBugs] Ensure proper lazy-initialization even if this costs some performance 2014-07-17 08:35:40 +10:00
Greg Wilkins
5f033b48d5 438204 leave IPv6 addresses [] wrapped in getServerName 2014-07-16 16:39:02 +10:00
Joakim Erdfelt
dd5cdab54c 439540 - setReuseAddress() in ServerConnector.java is not coded properly
+ Adding unit test to confirm existing behavior of
  ServerConnector.setReuseAddress(boolean) and ServerConnector.open()
2014-07-15 17:02:51 -07:00
Greg Wilkins
55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Greg Wilkins
0f70f28839 avoid race test failures 2014-07-03 15:10:48 +10:00
Greg Wilkins
78b03c5b8e More debug for intermittent failures 2014-07-02 16:01:00 +10:00
Greg Wilkins
0751256559 438434 ResourceHandler checks aliases 2014-06-27 21:46:59 +02:00
Greg Wilkins
9b764ef3fa 435322 Fixed Iterating Callback close 2014-06-27 20:43:12 +02:00
Joakim Erdfelt
56751dfa72 Merge branch 'master' into pathresource 2014-06-26 08:56:43 -07:00
Simone Bordet
17895f8256 438079 - Review garbage creation in 9.2.x series. 2014-06-26 13:16:08 +02:00
Simone Bordet
299d390dae Removed unnecessary reset of fields from onCompleteSuccess() and
onCompleteFailure().
They are not needed because these are methods that move the
IteratingCallback in a final state, so it won't be used anymore. And
if it is reset(), then those fields are already properly reset there.
2014-06-26 10:48:38 +02:00
Simone Bordet
4af586770e Cannot throw exceptions from reset(), must fail the callback instead. 2014-06-26 10:46:43 +02:00
Simone Bordet
2e57fb6fad Removed unnecessary volatile declaration.
Calls to reset() are always followed by iterate() that provides a memory barrier by changing its state, which is an AtomicReference.
2014-06-26 10:45:00 +02:00
Joakim Erdfelt
9f844383cd Making PathResource the default for "file://" resources
+ Making ResourceTest a proper @Parameterized test case
+ Moving jar tests out of ResourceTest into JarResourceTest
+ Moving classpath tests out of ResourceTest into ClassPathResourceTest
+ Making more improvements to PathResource to satisfy expecations in
  the rest of the codebase.
+ Requests for resource subpaths that use "//" in their strings will
  now work correctly (it used to result in null requests in
  FileResource)
2014-06-25 14:11:44 -07:00
Greg Wilkins
a746d78951 438079 435322 Fixed Iterating Callback fail handling and removed per send instance 2014-06-25 19:20:03 +02:00
Simone Bordet
3ff4195dbc Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[]. 2014-06-25 12:26:45 +02:00
Greg Wilkins
28ad689bcb 437996 avoid async status race by not setting 200 on handled 2014-06-24 12:27:03 +02:00
Jesse McConnell
c3ee0711ca [maven-release-plugin] prepare for next development iteration 2014-06-09 13:37:54 -05:00
Jesse McConnell
06b494eeac [maven-release-plugin] prepare release jetty-9.2.1.v20140609 2014-06-09 13:37:49 -05:00
Jesse McConnell
10b6c574ae Merge branch 'master' into release-9 2014-06-09 13:07:22 -05:00
Joakim Erdfelt
05575774a1 436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
+ Switching out support for ":" to "|"
2014-06-04 11:14:35 -07:00
Joakim Erdfelt
d62f45dbd2 436405 - ${jetty.base}/resources not on classpath with default configuration
+ Adding missing '/'
2014-06-02 13:56:54 -07:00
Jan Bartel
b09e7d33e2 436345 Refactor AbstractSession to minimize burden on subclasses to implement behaviour 2014-06-02 15:01:49 +02:00
Jan Bartel
1b00888739 436345 Refactor AbstractSession to ease customization 2014-06-02 11:48:28 +02:00
Jesse McConnell
2e859e4ae2 [maven-release-plugin] prepare for next development iteration 2014-05-26 12:04:15 -05:00
Jesse McConnell
71ad2114c5 [maven-release-plugin] prepare release jetty-9.2.0.v20140526 2014-05-26 12:04:08 -05:00
Jesse McConnell
7e71c42bc5 Merge branch 'master' into release-9 2014-05-26 11:36:41 -05:00
Jesse McConnell
5e3e0930e0 Revert "434810 better handling of bad messages"
This reverts commit 1e524f378ee77962a84c2b5efafe717078a5465d.
2014-05-26 11:20:07 -05:00
Jesse McConnell
aa3c9322a6 Revert "434810 better handling of bad messages"
This reverts commit 3f4a8abf9e9315306a9f0b1b51a2cb355c7a1fe1.
2014-05-26 11:20:00 -05:00