Commit Graph

2264 Commits

Author SHA1 Message Date
Greg Wilkins aaa2e5c6c1 refined PathResource alias handling 2014-08-02 12:58:24 +10:00
Simone Bordet 161bccda22 Merged branch 'master' into 'jetty-http2'. 2014-08-01 14:02:53 +02:00
Jan Bartel 75c92bf76a 438500 Odd NoClassDef errors when shutting down the jetty-maven-plugin via the stop goal 2014-08-01 12:44:30 +10:00
Greg Wilkins fa9b60c77e Merge remote-tracking branch 'origin/jetty-http2' into pathresource 2014-08-01 10:17:42 +10:00
Greg Wilkins 78165ce5ff fixed merge 2014-08-01 09:51:57 +10:00
Greg Wilkins b439549793 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2014-08-01 09:50:20 +10:00
Greg Wilkins 785c45d899 Merge remote-tracking branch 'origin/master' into pathresource 2014-08-01 09:49:59 +10:00
Greg Wilkins f970ffc0ac Misc cleanups done whilst fixing 435322 2014-08-01 09:02:44 +10:00
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
Greg Wilkins 70dafa8eb3 simplified HttpTransport API 2014-07-31 11:53:51 +10:00
Greg Wilkins 5d8780cb4e Record some TODOs 2014-07-28 15:27:40 +10:00
Greg Wilkins eaf374fa58 refactored Dispatcher for new HttpURI 2014-07-25 17:28:35 +10:00
Greg Wilkins 22e57ef7b7 refactored Request to use new HttpURI 2014-07-25 15:03:51 +10:00
Greg Wilkins 30123607c6 Major refactor of metadata and HttpURI
This refactor strives to remove duplication between the Metadata class and the HttpURI class.

Both classes have been made mutable (as they partially were anyway so best not to pretend).

HttpURI now holds the decomposed strings rather than a single string with indexes. This allows it to be rebuilt after changing just parts of the URI. It is now a lot more similar to the
JVM URI class and we could consider replacing it (after checking peformance).

Next step is to refactor the Request class to prevent it duplicating these fields.
2014-07-24 15:49:52 +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 2f41275b0f fixed merge syntax errors 2014-07-23 16:57:36 +10:00
Greg Wilkins 192e8e8ed1 expanded tabs in indents 2014-07-23 16:54:05 +10:00
Greg Wilkins fa3d7d0f7e Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Greg Wilkins ecb3ab7e5b Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2014-07-23 16:38:15 +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 467773dbdf Merged branch 'master' into 'jetty-http2'. 2014-07-22 21:14:46 +02: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 7f62f2600b refactored URI handling 2014-07-20 10:23:47 +10:00
Greg Wilkins 35ca372e30 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-19 18:56:15 +10:00
Greg Wilkins c72649e150 435653 encode async dispatched requestURI 2014-07-19 18:55:02 +10:00
Greg Wilkins fb2a67c0f9 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-19 00:49:37 +10:00
Greg Wilkins b38a978eac 439067 Improved graceful stop timeout handling 2014-07-19 00:46:55 +10:00
Greg Wilkins a537fefd6b Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-18 15:28:54 +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 64e5c1e0ce Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-17 11:32:27 +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 6893027ecd Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
2014-07-16 17:23:29 +10:00
Greg Wilkins 3bbd1dae59 fixed merge 2014-07-16 16:40:12 +10:00
Greg Wilkins 5f033b48d5 438204 leave IPv6 addresses [] wrapped in getServerName 2014-07-16 16:39:02 +10:00
Greg Wilkins 853e020210 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-16 15:31:48 +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