Commit Graph

14506 Commits

Author SHA1 Message Date
Simone Bordet 3b73265331 Code cleanups. 2016-12-20 11:40:27 +01:00
Joakim Erdfelt 4669cc70c8 Merge pull request #1180 from WalkerWatch/issues/1061
Issue #1061 Documentation
2016-12-19 12:59:45 -07: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 8aacd26e75 Documentation changes for WatchService.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-19 13:20:35 -05: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
Joakim Erdfelt a4a983b3ec Merge pull request #1189 from WalkerWatch/issues/1188
Issue #1188 - Fixed dependency.
2016-12-19 09:26:14 -07:00
WalkerWatch 22f48ac369 Issue #1188 - Fixed dependency.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-19 00:23:59 -05:00
Simone Bordet d3ce624d9a Merged branch 'jetty-9.4.x' into 'master'. 2016-12-17 18:38:52 +01:00
Simone Bordet 02ccbefb8a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-17 18:38:16 +01: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 8cafca7c64 Fixes #1185 - Connection abruptly closed for HEAD requests.
Only checking if the Content-Length and the actual
content written match for responses that have a body.
2016-12-16 18:45:45 +01:00
Simone Bordet c3e608fae3 Fixes #1184 - IllegalStateException for HEAD requests responded with 404.
Now committing the default 404 response body early,
so that attempts to try to change the content length
will be ignored since the response is already committed.
2016-12-16 18:38:27 +01:00
Joakim Erdfelt 1441a1495b Fixes #1138 - Adding jetty-client dependency to websocket.mod 2016-12-16 09:27:56 -07:00
Joakim Erdfelt 1c16964118 Merge branch 'jetty-9.4.x' 2016-12-16 08:38:16 -07:00
Joakim Erdfelt 44596a7714 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-16 08:38:01 -07: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
WalkerWatch d6c7f99d85 Issue #1061 Documentation
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-15 13:53:17 -05: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
Joakim Erdfelt b0c0706e8d Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-12-15 10:16:15 -07:00
Joakim Erdfelt ee3631b2f5 Merge pull request #1179 from WalkerWatch/issues/981
Resolves #981
2016-12-15 10:10:41 -07:00
WalkerWatch 54cdac49fe Resolves #981
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-15 12:01:14 -05: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 fe831c9754 Issue #1044 - upgrading version of jnr-unixsocket 2016-12-15 07:13:07 -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 b2162cb347 Merge pull request #1159 from WalkerWatch/issues/1139
Issue #1139 - Documented new features and misc cleanup.
2016-12-14 13:10:28 -07:00
Joakim Erdfelt 7cda58137f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-14 12:18:52 -07:00
Joakim Erdfelt c70fa88be0 Issue #1175 - Correcting test DispatchType 2016-12-14 12:16:53 -07:00
Joakim Erdfelt 58b8f56a36 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-14 12:15:50 -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 b6c4e5b7c9 Merged branch 'jetty-9.4.x' into 'master'. 2016-12-14 11:53:48 +01:00
Simone Bordet dd3a73e57a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-14 11:19:49 +01:00
Simone Bordet 98fad34ca0 Fixes #1167 - NPE while completing a reset HTTP/2 stream. 2016-12-14 11:09:10 +01: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 3a3978f86b Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-13 10:16:36 +01:00
Jesse McConnell 9f012dcd17 Merge branch 'release-9.4.0' into jetty-9.4.x 2016-12-12 09:03:57 -06:00
Simone Bordet bc3c3ff9c8 Improved logging. 2016-12-12 16:00:12 +01:00