Commit Graph

9240 Commits

Author SHA1 Message Date
Greg Wilkins ce5af1d521 424982 improved PID check in jetty.sh 2014-04-25 12:56:41 +02:00
Greg Wilkins 8855b79be5 433431 Support ServletHandler fall through 2014-04-25 12:21:55 +02:00
Greg Wilkins b764a1d136 433244 Security manager lifecycle cleanup 2014-04-24 15:46:08 +02:00
Greg Wilkins 4b26faf897 433244 Session manager lifecycle cleanup 2014-04-24 13:31:00 +02:00
Jan Bartel e2ed934978 433365 No such servlet: __org.eclipse.jetty.servlet.JspPropertyGroupServlet__ 2014-04-24 11:47:04 +02:00
Simone Bordet 28d966a6f5 Merged branch 'jetty-9.1.x' into 'master'. 2014-04-24 11:25:09 +02:00
Simone Bordet 63d59feb0f 433370 - PATCH method does not work with ProxyServlet.
Fixed by using Request.method(String) rather than
Request.method(HttpMethod).
2014-04-24 11:21:56 +02:00
Greg Wilkins 9a428def2d Improved failsafe close handling for half closed endpoints
(cherry picked from commit 61b2e7f75e)
2014-04-24 10:16:32 +02:00
Joakim Erdfelt 6861e2db99 EndPoint onIdleExpired should not close on its own
+ From discussion with Simone, the dispatched fillInterest.onFail()
  needs to occur, so that the AbstractConnection.onReadTimeout() can
  handle the close conditions needed by SPDY and WebSocket.
  The EndPoint close within onIdleExpired is a race condition with
  this onReadTimeout desired behavior.

(cherry picked from commit 9f76856fcf)
2014-04-24 10:16:21 +02:00
Greg Wilkins 61b2e7f75e Improved failsafe close handling for half closed endpoints 2014-04-24 10:01:46 +02:00
Simone Bordet aa394123cb Merged branch 'jetty-9.1.x' into 'master'. 2014-04-23 22:27:52 +02:00
Simone Bordet 76a1e032eb Allow subclasses to override the proxied request content. 2014-04-23 22:26:22 +02:00
Joakim Erdfelt 2bc9accd98 433262 - WebSocket / Advanced close use cases
+ Fixing bad assumptions in unit tests where the client would send a few
  frames to test the protocol behavior followed by the close frame.
  But the test expected the server to initiate the close, but this setup
  of the tests would mean that the client initiated the close.
2014-04-23 12:56:00 -07:00
Joakim Erdfelt 900dea3719 433262 - WebSocket / Advanced close use cases
+ ClientCloseTest implementation of various outlined use cases.
2014-04-22 16:07:45 -07:00
Simone Bordet aeb27cd461 431642 - Implement ProxyServlet using Servlet 3.1 async I/O.
Intermediate commit that implements asynchronous content in HttpClient,
for the HTTP protocol, passing the tests.

This work needs to be extended to FCGI and SPDY and finally implement
the asynchronous proxy servlet.
2014-04-19 12:36:15 +02:00
Simone Bordet 1185febb74 Merged branch 'master' into '431642'. 2014-04-18 15:19:18 +02:00
Simone Bordet 04f4e6fb5b Merged branch 'master' into '431642'. 2014-04-18 15:08:53 +02:00
Joakim Erdfelt 9f76856fcf EndPoint onIdleExpired should not close on its own
+ From discussion with Simone, the dispatched fillInterest.onFail()
  needs to occur, so that the AbstractConnection.onReadTimeout() can
  handle the close conditions needed by SPDY and WebSocket.
  The EndPoint close within onIdleExpired is a race condition with
  this onReadTimeout desired behavior.
2014-04-17 10:38:06 -07:00
Simone Bordet 4aa1fbe452 Updated module files for JDK 7u55 and JDK 8u05 with the right ALPN versions. 2014-04-17 16:28:59 +02:00
Simone Bordet 42d98ebb61 Merged branch 'jetty-9.1.x' into 'master'. 2014-04-17 16:24:16 +02:00
Simone Bordet 2a177f2206 Added URL for new NPN version. 2014-04-17 16:23:52 +02:00
Simone Bordet 7bc0363b30 Updated profiles for JDK 7u55 and JDK 8u05 with the right NPN and ALPN versions. 2014-04-17 13:56:10 +02:00
Simone Bordet 4fb13d2c58 Merged branch 'jetty-9.1.x' into 'master'. 2014-04-17 13:28:36 +02:00
Simone Bordet d90e6210bb 432777 - Async Write Loses Data with HTTPS Server.
Fixed by properly flipping the aggregate buffer when copying bytes to it.
2014-04-17 13:28:17 +02:00
Simone Bordet 7c8c45c397 432993 - Improve handling of ProxyTo and Prefix parameters in ProxyServlet.Transparent.
Fixed case of empty context path and missing Prefix parameter.
2014-04-17 13:27:34 +02:00
Simone Bordet c3d3edd6c0 432777 - Async Write Loses Data with HTTPS Server.
Fixed by properly flipping the aggregate buffer when copying bytes to it.
2014-04-16 17:33:22 +02:00
Simone Bordet 60f2200184 Merged branch 'jetty-9.1.x' into 'master'. 2014-04-16 11:10:18 +02:00
Simone Bordet 40c82a99ab Added profile in the main pom.xml to build with JDK 7u55.
Added new NPN module files for  JDK 7u55, referencing the new NPN version required by JDK 7u55.
2014-04-16 11:06:50 +02:00
Joakim Erdfelt 348cd406c8 Removing deprecated methods 2014-04-15 14:54:19 -07:00
Joakim Erdfelt e5314d4a3e 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Adding Config Search order output to --list-config
2014-04-15 13:40:16 -07:00
Joakim Erdfelt dc3362ba3c Removing deprecated methods 2014-04-15 12:22:53 -07:00
Joakim Erdfelt 2dc10da3a4 Merge branch 'extra-start-dirs' 2014-04-15 10:34:02 -07:00
Joakim Erdfelt 41ab91988b 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Fixing jetty.base default detection to use user.dir instead of
  jetty.home
2014-04-15 10:32:28 -07:00
Joakim Erdfelt 599595f544 FS utility class cleanup of unused code 2014-04-15 10:31:27 -07:00
Joakim Erdfelt db2c6c20b9 Test failure fix 2014-04-15 10:16:52 -07:00
Joakim Erdfelt cad7d3f5ed Attempt to work out websocket close notification issue that simone raised 2014-04-15 10:14:03 -07:00
Joakim Erdfelt de8485d53e Merge branch 'master' into extra-start-dirs 2014-04-15 08:09:21 -07:00
Simone Bordet f2e2eec4d5 Merged branch 'jetty-9.1.x' into 'master'. 2014-04-15 09:04:20 +02:00
Simone Bordet 361d8e5bd2 432528 - IllegalStateException when using DeferredContentProvider.
Fixed by using the correct idiom for calling the IteratingCallback.
2014-04-15 09:03:30 +02:00
Simone Bordet d6e538a9d2 Avoid duplicating existing headers when copying requests. 2014-04-15 09:03:30 +02:00
Jan Bartel e252b52eb3 432483 make osgi.serviceloader support for javax.servlet.ServletContainerInitializer optional
(cherry picked from commit 31043d2570)

Conflicts:
	jetty-annotations/pom.xml
2014-04-12 09:15:53 +10:00
Jan Bartel 31043d2570 432483 make osgi.serviceloader support for javax.servlet.ServletContainerInitializer optional 2014-04-12 09:12:25 +10:00
Joakim Erdfelt 7cd3f9983f Compile fix 2014-04-11 16:03:49 -07:00
Joakim Erdfelt 8f733169f5 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Final work for unit testing happiness
+ BaseHome is now configured via ConfigSources (as intended)
+ StartArgs now parses the ConfigSources list (in reverse)
+ CommandLineConfigSource now does all of the ${jetty.base} and
  ${jetty.home} determination (from properties and env, with
  fallbacks)
2014-04-11 14:26:35 -07:00
Simone Bordet 3717115059 Merged branch 'jetty-9.1.x' into 'master'. 2014-04-11 17:02:26 +02:00
Simone Bordet 5eeda38f0a 432270 - Slow requests with response content delimited by EOF fail.
Fixed also in the FastCGI module.
2014-04-11 16:18:38 +02:00
Simone Bordet 4975cae881 Further progress on 431642 (async proxy servlet). 2014-04-11 09:45:21 +02:00
Jan Bartel eb45d45dbf 432483 jetty-annotations bundle does not start if there are no bundles that provide a service javax.servlet.ServletContainerInitializer
(cherry picked from commit f2f5353a29)
2014-04-11 17:27:58 +10:00
Jan Bartel f2f5353a29 432483 jetty-annotations bundle does not start if there are no bundles that provide a service javax.servlet.ServletContainerInitializer 2014-04-11 17:25:08 +10:00
Greg Wilkins deb7102e0e 404511 removed deprecated StringMap 2014-04-11 10:57:39 +10:00