Commit Graph

13614 Commits

Author SHA1 Message Date
Joakim Erdfelt e5fb1558a8 toConnectionString() can handle null connection 2016-12-01 13:06:50 -07:00
Joakim Erdfelt 709938e02b Merge branch 'issue-117' into jetty-9.4.x 2016-12-01 13:06:08 -07:00
Joakim Erdfelt 47fd7e1bd2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-30 14:41:43 -07:00
Joakim Erdfelt 4b5e5566e8 Issue #117 - minor code review changes 2016-11-30 10:50:05 -07:00
Joakim Erdfelt 63d93160f1 Issue #1124 - post review cleanup of changes with @sbordet 2016-11-30 10:16:25 -07:00
Greg Wilkins 7a741f93ee Issue #1139 read command line from file 2016-11-30 21:20:50 +11:00
Greg Wilkins 95eef4e98c Issue #1139 set properties during --add-to-start 2016-11-30 20:33:34 +11:00
Jan Bartel f64cdd46b8 Issue #1138 2016-11-30 15:55:40 +11:00
Joakim Erdfelt 6c48d62da6 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-11-29 15:49:21 -07:00
Joakim Erdfelt 70247d74d9 Issue #1124 - Fixing up merge issues
+ Making WebSocketServletFactory always load a new
  WebSocketServerFactory
+ Making WebSocketServerFactory need a ServletContext
  to construct it, if appropriate (the WebSocketHandler
  approach doesn't use a ServletContext)
+ NativeWebSocketConfiguration is now a bean of
  ServerContainer
+ Removed WebSocketServletFactory.init(ServletContext) method
+ Renamed WebSocketServletFactory.init() to .start()
+ Renamed WebSocketServletFactory.cleanup() to .stop()
+ CDI & Websocket now works
+ Using a ServletContextListener now works
+ DecoderFactory and EncoderFactory now work
2016-11-29 15:46:03 -07:00
Greg Wilkins 32eff3ffd3 apply #1135 to XmlConfiguration 2016-11-30 09:40:09 +11:00
Jan Bartel 640801987c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-30 09:37:21 +11:00
dreis2211 9b0f6b1fd5 Issue #1135 - Avoid allocations from Method.getParameterTypes() if possible
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
(cherry picked from commit 16334c1893)
2016-11-30 09:36:30 +11:00
Joakim Erdfelt f54938178e Merge branch 'jetty-9.2.x' into 'jetty-9.3.x' 2016-11-29 14:29:33 -07:00
Joakim Erdfelt e329e386f0 Issue #117 - Carrying over the work from features/wsclient-httpclient 2016-11-28 15:45:38 -07:00
Simone Bordet c0b94a9d41 Merged branch 'issue-1124-9.2.x' into 'jetty-9.2.x'. 2016-11-25 15:46:14 +01:00
Simone Bordet 1a77cb95ba Resetting the field that marks the filter exported as a context attribute. 2016-11-25 15:39:02 +01:00
Joakim Erdfelt a73e466e4d Issue #1124 - WebSocketUpgradeFilter + ServletContextListener
+ Now Spring and its initialization of WebSocketUpgradeFilter
  can work.
+ Improves life for cometd 3.1.0 as well
2016-11-25 15:39:02 +01:00
Joakim Erdfelt c509a83d3b Issue #1124 - adding more web.xml test cases 2016-11-25 07:38:20 -07:00
Simone Bordet 919f164bb3 Merged branch 'jetty-9.2.x' into 'issue-1124-9.2.x'. 2016-11-25 15:11:40 +01:00
Simone Bordet fb509eefe4 Resetting the field that marks the filter exported as a context attribute. 2016-11-25 15:10:32 +01:00
Simone Bordet f70c6f790c Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-25 09:05:07 +01:00
Simone Bordet dd76ed2449 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-11-25 09:04:16 +01:00
Simone Bordet f254dbc0b6 Fixes #1130 - PROXY protocol support reports incorrect remote address. 2016-11-25 08:56:56 +01:00
Simone Bordet 59786f1f65 Code cleanup. 2016-11-25 08:56:56 +01:00
Jan Bartel 76b7686bc7 Issue #1117 2016-11-25 14:48:55 +11:00
Greg Wilkins dd2f9d73b6 tests cleanup 2016-11-25 14:37:19 +11:00
Greg Wilkins 0b54fa0bc7 Issue #1128 2016-11-24 15:47:11 +11:00
Jan Bartel 40d9e56d92 Issue #1117 2016-11-24 14:04:37 +11:00
Joakim Erdfelt a3f32911fa Issue #1124 - WebSocketUpgradeFilter + ServletContextListener
+ Now Spring and its initialization of WebSocketUpgradeFilter
  can work.
+ Improves life for cometd 3.1.0 as well
2016-11-23 19:55:36 -07:00
Greg Wilkins deac849325 Fixes #1127
Fixes #1127 by updating #1074 solution.  Spurious calls to HttpInput.run can be ignored.
Hide some more test stacks
2016-11-24 10:18:06 +11:00
Joakim Erdfelt 526ea55e9b Merge pull request #1121 from eclipse/issue-1108
Issue #1108 - adding SslContextFactory.dump() selection details
2016-11-23 08:48:00 -07:00
Joakim Erdfelt 3e963df353 Adding missing license header
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-23 06:07:13 -07:00
Joakim Erdfelt 5b5a2e845b Removing commented out debug code 2016-11-23 06:05:35 -07:00
Simone Bordet c5c0cc71d0 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-23 12:18:29 +01:00
Simone Bordet a9817d7ac2 Fixes #1123 - Broken lifecycle for WebSocket's mappings.
Now resetting the mappings in the lifecycle callbacks of the
enclosing classes.
2016-11-23 12:14:01 +01:00
Greg Wilkins 2ef23a6725 Issue #572
Improved to the toString and dump output of connections, endpoints and channel to assist with debugging
made the SSL callbacks and runnables Invocable to avoid thread starvation.
2016-11-23 16:58:35 +11:00
Jan Bartel b839f40721 Add more session doc 2016-11-23 14:56:30 +11:00
Jan Bartel 3d94396d0d Merge pull request #1115 from WalkerWatch/updates/runner
Issue #1092 Documentation updates.
2016-11-23 14:53:11 +11:00
Joakim Erdfelt efc227e0e4 Updates for better ThreadStarvationTests 2016-11-22 17:37:40 -07:00
Joakim Erdfelt bb428fb402 Using non-deprecated SocketChannelEndpoint 2016-11-22 16:35:56 -07:00
Joakim Erdfelt 7c90d19983 Minor updates to ThreadStarvationTest to diagnose read starvation under SSL issue 2016-11-22 15:00:13 -07:00
Joakim Erdfelt d57cfe8ce1 Issue #1108 - adding comment about the purpose of the pristine SSLEngine
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-22 12:00:10 -07:00
Joakim Erdfelt b308574dd5 Issue #1108 - Use pristine SSLEngine for detecting JreDisabled
+ The use of the SSLEngine from SslContextFactory will include
  the as-configured the SSLEngine exclusions from the configuration.
  The dump routines now use a fresh SSLEngine to detect the JVM
  level disabled features.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-22 11:46:43 -07:00
Joakim Erdfelt 1672904d84 Issue #1108 - adding SslContextFactory.dump() selection details
+ Protocol selection details
+ Cipher Suites selection details

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-22 11:30:13 -07:00
Joakim Erdfelt d361786e43 Issue #1118 - Eliminating .destroy() conflict
+ extending from AbstractLifeCycle instead of ContainerLifeCycle
2016-11-22 09:48:01 -07:00
WalkerWatch 51ac6dd469 Issue #1092 Documentation updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-11-18 14:14:54 -05:00
Jan Bartel d57c281d14 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-18 14:18:02 +11:00
Jan Bartel 12c0663e6c Issue #1092 2016-11-18 14:17:43 +11:00
Jan Bartel 98ad4e1610 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-18 13:51:16 +11:00