Commit Graph

8094 Commits

Author SHA1 Message Date
Jan Bartel edaa23b21e 416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars 2013-09-05 13:03:45 +10:00
Jan Bartel 2ab4757450 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-05 12:55:19 +10:00
Jan Bartel e764a0f2e7 416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars 2013-09-05 12:47:39 +10:00
Greg Wilkins 236f5d57bf 414431 Avoid debug NPE race 2013-09-05 12:24:28 +10:00
Greg Wilkins ce098c67de 416477 Improved consumeAll error handling 2013-09-05 12:09:22 +10:00
Greg Wilkins 9b9c7ba8d1 416568 Simplified servlet exception logging 2013-09-05 11:04:11 +10:00
Simone Bordet 4663fa4992 Renamed "Empty" inner classes to "Adapter" to comply with the rest of
the codebase.
2013-09-04 13:15:23 +02:00
Simone Bordet 3be5670448 413387 - onResponseHeaders is not called multiple times when multiple
redirects occur.

Refactored the redirection code into HttpRedirector to ease
applications that need to access the redirect URI and then redirect.
2013-09-04 12:57:02 +02:00
Simone Bordet e65f21634d 415047 - Create URIs lazily in HttpClient.
URIs are now created lazily, although a call to Request.getURI() is
made anyway for each request sending (and therefore the URI is
created anyway for each send). However, we save creating multiple
URIs in case the scheme, path, query or params are changed before
sending the request.
2013-09-04 09:58:20 +02:00
Joakim Erdfelt 73f06c2a14 412205 - SSL handshake failure leads to unresponsive UpgradeConnection
+ Passing failure() back out of the UpgradeConnection
2013-09-03 13:15:04 -07:00
Joakim Erdfelt d920ef8c40 415899 - jetty-start / add --lib=<cp> capability from Jetty 7/8
+ Adding --lib=<cp> concept from Jetty 7/8 to allow for arbitrary
  library additions, similar to how path=<name> and lib=<name>
  was used back in those revisions.
2013-09-03 11:26:35 -07:00
Joakim Erdfelt 02a838bef7 Removing unused test resources 2013-09-03 11:26:30 -07:00
Simone Bordet 8422dd5b1a Relaxed accessibility modifiers of a few methods to support FCGI
parsing, and introduced method setResponseStatus(int) to set the
response status programmatically (since in FCGI the response line does
not exist and therefore it is not parsed).
2013-09-03 16:10:07 +02:00
Simone Bordet f10562f269 Merged branch 'master' into 'jetty-9.1'. 2013-09-03 10:41:15 +02:00
Simone Bordet 78c322af8e 416314 - jetty async client wrong behaviour for HEAD Method + Redirect.
Fixed redirect behavior based on
http://greenbytes.de/tech/tc/httpredirects/.
2013-09-03 10:34:30 +02:00
Jan Bartel dd8b397723 Update to latest jetty-schemas version. 2013-09-02 17:16:45 +10:00
Jan Bartel a98bbc31e0 Make jsp 2.3.2 work for jetty-9.1, bring osgi tests back into the build. 2013-09-02 17:14:17 +10:00
Greg Wilkins 2e444d2f17 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
2013-09-02 17:00:07 +10:00
Greg Wilkins eec9d405e5 416321 handle failure during blocked committing write 2013-09-02 14:56:22 +10:00
Greg Wilkins 07ae3615ed 416321 handle failure during blocked committing write 2013-09-02 14:44:23 +10:00
Greg Wilkins 317a3f27df 416321 improved test harnesses 2013-09-02 12:24:51 +10:00
Joakim Erdfelt d539fd7e5f Adding jsp module to demo 2013-08-30 13:09:14 -07:00
Joakim Erdfelt 444a49f97e Adding --write-module-graph=<filename> 2013-08-30 13:08:32 -07:00
Joakim Erdfelt 8fdc6b05bb Fixing logging.mod for new module format 2013-08-30 13:08:11 -07:00
Simone Bordet cc6e2964be Made Fields.Field constructor public. 2013-08-30 18:45:16 +02:00
Thomas Becker d51268977b fix merge issue 2013-08-30 18:00:47 +02:00
Thomas Becker d22fa0dae1 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:22:11 +02:00
Thomas Becker 85c0f47337 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:22:05 +02:00
Thomas Becker 669ee75720 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:21:59 +02:00
Thomas Becker 566065dd34 cleanup import in HttpConnection 2013-08-30 17:21:53 +02:00
Thomas Becker 8ba45188db merge ProxyHTTPSPDYConnection change with 9.1 2013-08-30 17:19:47 +02:00
Thomas Becker 8e4bae0ccf 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:16:22 +02:00
Thomas Becker b370da6783 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE 2013-08-30 17:16:14 +02:00
Thomas Becker b54538793b 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:15:15 +02:00
Thomas Becker 1ad4f89638 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:15:15 +02:00
Thomas Becker f12afb2888 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:15:14 +02:00
Thomas Becker a9955ebc91 cleanup import in HttpConnection 2013-08-30 17:15:14 +02:00
Thomas Becker fcdea1d4b4 416242 respect persistence headers in ProxyHTTPSPDYConnection 2013-08-30 17:15:14 +02:00
Thomas Becker 9565d2647e 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:15:14 +02:00
Thomas Becker 936343a3e5 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE 2013-08-30 17:15:13 +02:00
Simone Bordet 5e3322cd11 Removed unused dependencies. 2013-08-30 16:30:14 +02:00
Greg Wilkins c9ddc8f345 415826 start.jar replace --enable with --module-ini
Fixed up comments in start.ini
2013-08-30 16:30:39 +10:00
Greg Wilkins 5948e8c7c2 jetty-start fixed deploy of jetty.base
Set the jetty.base and jetty.home Properties for webapps/*.xml evaluation
2013-08-30 16:10:35 +10:00
Greg Wilkins 4d6fd407b5 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-30 14:45:42 +10:00
Greg Wilkins 4358302ce0 416102 - Clean up of async sendContent process 2013-08-30 14:45:21 +10:00
Greg Wilkins b5d3aeab0f Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-08-30 14:41:33 +10:00
Greg Wilkins 5fce6408d0 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-30 14:38:41 +10:00
Greg Wilkins 79fb4287bb Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-08-30 14:37:55 +10:00
Greg Wilkins 47c679dabb 416102 - Clean up of async sendContent process 2013-08-30 14:37:43 +10:00
Joakim Erdfelt 7d50302562 Fixing distribution build + demo-base start port 2013-08-29 15:26:31 -07:00