13778 Commits

Author SHA1 Message Date
Jan Bartel
2a2af4c026 Issue #1195 2016-12-22 11:56:21 +11:00
Joakim Erdfelt
083bb4bd82 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-21 14:56:55 -07:00
Joakim Erdfelt
77c63a1648 Merge branch 'release-9.3.15' into jetty-9.3.x 2016-12-21 14:56:08 -07:00
Joakim Erdfelt
d4468f0a65 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-12-21 14:55:27 -07:00
Joakim Erdfelt
64f714689e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-20 15:38:36 -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 jetty-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
9c68bd44fa Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-20 16:17:14 +01: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
df986acaeb Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-20 11:55:15 +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
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
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
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 jetty-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
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