Commit Graph

12745 Commits

Author SHA1 Message Date
Joakim Erdfelt d4468f0a65 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-12-21 14:55:27 -07:00
Joakim Erdfelt b9fd70f5ad Bumping up test timeouts 2016-12-20 14:31:56 -07:00
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Joakim Erdfelt 4bfb312a8c Updating jetty-version-maven-plugin 2016-12-20 12:28:48 -07:00
Simone Bordet a15f8964c4 Cleanups for #1172. 2016-12-20 16:15:35 +01:00
Konstantin Gribov 9657be1c72 Fixes #1171 - Jetty-client throws NPE for request to IDN hosts only when `HttpClient#send(...)` is called.
Added early check for null host when creating requests in HttpClient.
Added test for incorrect IDN redirect.

Signed-off-by: Konstantin Gribov <grossws@gmail.com>
Reviewed-by: Simone Bordet <simone.bordet@gmail.com>
2016-12-20 16:08:48 +01:00
Simone Bordet 753aa5ca37 Issue #1146 - jetty.server.HttpInput deadlock.
Moved calls to close(Throwable) outside synchronized blocks, since
they mail fail callbacks that reenter into caller code, causing
deadlocks.
2016-12-20 11:40:27 +01:00
Simone Bordet 3b73265331 Code cleanups. 2016-12-20 11:40:27 +01:00
Joakim Erdfelt b53e8cb832 Merge pull request #1176 from WalkerWatch/jetty-9.3.x
Version updates.
2016-12-19 12:59:10 -07:00
WalkerWatch 8874179f55 Corrected versions
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-19 12:58:52 -05:00
cao tianze 0a97b66b14 delete redundant addBean(serverChannel) invoke
Signed-off-by: cao tianze <hnrcao@qq.com>
2016-12-20 01:15:32 +08:00
Simone Bordet f3a4ab1ae7 Fixes #1186 - Where can i find SocketConnector.java and BlockingChannelConnector.java etc? 2016-12-17 18:37:17 +01:00
Joakim Erdfelt 266cac25f8 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-12-16 16:34:17 -07:00
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00
Joakim Erdfelt bcbcee7f23 Updating to version 9.2.20.v20161216 2016-12-16 15:47:41 -07:00
Joakim Erdfelt 6d681ce999 Using jetty-version plugin 2.3 2016-12-16 15:38:11 -07:00
WalkerWatch 5b88d772ee Merge branch 'jetty-9.3.x' of https://github.com/eclipse/jetty.project into jetty-9.3.x 2016-12-16 12:57:43 -05:00
Simone Bordet 3e42b68d9e Added test cases for HEAD requests. 2016-12-16 15:34:13 +01:00
Simone Bordet 91eb6a2405 Removed usage of special empty buffers, not needed. 2016-12-16 11:19:18 +01:00
Simone Bordet 8864361c1a Fixes #1181 - Review buffer underflow cases in SslConnection. 2016-12-16 10:40:06 +01:00
Joakim Erdfelt 4c93385611 Merge branch 'issue-1114' into jetty-9.3.x 2016-12-15 10:45:11 -07:00
Joakim Erdfelt c698c95e9b Issue #1114 - removing redundant exportConfiguration 2016-12-15 10:44:34 -07:00
Jesse McConnell cdfbf966ff Update CONTRIBUTING.md 2016-12-15 07:59:08 -07:00
Jesse McConnell 04909b4e98 Update CONTRIBUTING.md
updated
2016-12-15 07:57:45 -07:00
Joakim Erdfelt bd104d59f9 Issue #1114 - persisting NativeWebSocketConfiguration mappings
+ Mappings are persisted if added to the NativeWebSocketConfiguration
  before that configuration is started.  Otherwise they are cleared
  out on configuration.stop() lifecycle (like before)
2016-12-14 15:31:23 -07:00
Joakim Erdfelt 05f397caa4 Issue #1114 - Adding initial stop/start test logic 2016-12-14 13:20:28 -07:00
Joakim Erdfelt c70fa88be0 Issue #1175 - Correcting test DispatchType 2016-12-14 12:16:53 -07:00
Joakim Erdfelt f91d1e01fe Issue #1175 - More realistic test of commons-fileupload behavior 2016-12-14 11:53:10 -07:00
Joakim Erdfelt f846b37cbb Issue #1175 - Adding testcase to Jetty 9.3.x 2016-12-14 10:58:36 -07:00
WalkerWatch 569eaa20b5 Version updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-14 12:22:43 -05:00
Simone Bordet 07c9bc5a51 Fixes #1169 - HTTP/2 reset on a stalled write does not unblock writer thread.
The fix notifies the transport when a reset frame is received,
allowing the transport to fail the write callback which then notifies
the application, either by throwing (in case of blocking writes) or
by calling error listeners.

Also added a guard, in HttpChannel.handle() for the ERROR_DISPATCH case,
that checks if the response is already committed, and if so, abort
the transport - similar to what's already there for 9.4.
2016-12-14 11:07:00 +01:00
Joakim Erdfelt 9b609e0f6d Issue #1161 - Leaving CookieStore alone HttpClient and WebSocketClient are stopped
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-12-14 09:00:12 +01:00
Simone Bordet bc3c3ff9c8 Improved logging. 2016-12-12 16:00:12 +01:00
Ben Duffield c7e139a8a6 fix typo in PathParamServerEndpointConfig javadoc (#1145)
Signed-off-by: Ben Duffield <bduffield@palantir.com>
2016-12-08 18:08:06 +11:00
Jan Bartel fe493c2c06 Issue #1124
Fix classloading of WebSocketServerFactory for osgi.
2016-12-08 17:25:18 +11:00
Greg Wilkins af5d27c2f7 Issue #1146 DecryptedEndPoint deadlock 2016-12-07 22:50:27 +11:00
Greg Wilkins ec0b1ea847 Issue #1134 HPACK
Improved exceptions when receiving unknown index or a field that cannot be indexed.
2016-12-02 13:40:58 +11:00
Greg Wilkins b6b33bd679 Issue #1134 HPACK
Added test that demonstrates large headers are incorrectly indexed
Do not index fields if too large to fit
2016-12-02 10:27:14 +11:00
Joakim Erdfelt 63d93160f1 Issue #1124 - post review cleanup of changes with @sbordet 2016-11-30 10:16:25 -07: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
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
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