Commit Graph

2285 Commits

Author SHA1 Message Date
Simone Bordet 8e62a50500 442086 - Review HttpOutput blocking writes.
Reviewed blocking writes call sites and handled exceptions in the same
way for all of them, calling HttpChannel.abort(Throwable).

Modified HttpChannel.abort() to take the failure as parameter, so that
subclasses may inspect the failure and decide what to do.
2014-08-19 18:37:53 +02:00
Greg Wilkins 1c71040eca moved config plugin to profile 2014-08-15 19:53:52 +10:00
Greg Wilkins b47f9ef605 cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
Simone Bordet a2360bd542 Fixed creation of HttpURI for push requests. 2014-08-14 23:00:21 +02:00
Greg Wilkins a14d843382 ignored osgi-spdy tests 2014-08-14 15:18:28 +10:00
Greg Wilkins 98b654ba20 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-distribution/pom.xml
2014-08-14 08:38:25 +10:00
Greg Wilkins 2af613a28b improved debugging output 2014-08-13 15:56:02 +10:00
Simone Bordet 14dc4fade0 Updated log statements to use debug() instead of info(). 2014-08-12 22:32:17 +02:00
Simone Bordet 814c84a212 Introduced configuration properties for ALPN/NPN advertised protocols.
No more need to copy protonego-alpn.xml to a jetty.base to specify
which protocols are advertised and in which order.
Instead, simply specify:

alpn.protocols=h2-14,http/1.1
alpn.defaultProtocol=http/1.1

in start.ini (in the example above for http2).
2014-08-12 18:54:33 +02:00
Simone Bordet d2fa4dca60 Introduced configuration properties for ALPN/NPN advertised protocols.
No more need to copy protonego-alpn.xml to a jetty.base to specify
which protocols are advertised.
Instead, simply specify:

protonego.protocols=h2-14,http/1.1
protonego.defaultProtocol=http/1.1

in start.ini (in the example above for http2).
2014-08-11 23:59:26 +02:00
Greg Wilkins 5da39140df remove old TODOs 2014-08-08 18:30:56 +10:00
Greg Wilkins 4d7ead76ce basic push cache filter 2014-08-08 17:01:05 +10:00
Greg Wilkins 6dfa452e29 case insensitive protocols 2014-08-07 19:00:31 +10:00
Greg Wilkins 55aa2a07b4 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-07 15:29:12 +10:00
Greg Wilkins 1d5998f02e 441073 isEarlyEOF on HttpInput 2014-08-07 15:05:22 +10:00
Greg Wilkins 287e86b7aa decomposed https,http2 and spdy modules to share ServerConnector 2014-08-07 12:58:12 +10:00
Greg Wilkins a4d4b3ab57 fix work around classloaders for field preencoders 2014-08-07 09:22:22 +10:00
Greg Wilkins 17f46665df preencoded httpfield optimisation 2014-08-06 21:09:26 +10:00
Greg Wilkins b5971484a5 Basic push mechanism skeleton 2014-08-06 10:50:55 +10:00
Greg Wilkins bec34b460f optimised HttpFields 2014-08-05 17:26:27 +10:00
Greg Wilkins 6b3c8d06a9 partial 100 continues support in http2 2014-08-05 16:14:53 +10:00
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