13696 Commits

Author SHA1 Message Date
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
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
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
Jan Bartel
5d5b9c5998 Issue #1162 2016-12-12 20:24:54 +11:00
Greg Wilkins
dd50c9fa24 Fixes #1163 2016-12-12 19:55:40 +11:00
WalkerWatch
ff804b6445 Issue #1139 - Documented new features and misc cleanup.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-09 15:15:39 -05:00
Jesse McConnell
6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell
c54efb5929 Updating to version 9.4.0.v20161208 jetty-9.4.0.v20161208 2016-12-08 08:56:45 -06:00
Jesse McConnell
026c1656b9 set for release 2016-12-08 08:54:56 -06:00
Jesse McConnell
19333b8b3b Merge branch 'jetty-9.4.x' into release-9.4.0 2016-12-08 08:50:15 -06:00
Jan Bartel
4f48d7aadf Issue #1153
Refactor calcExpiry methods a little.
2016-12-08 20:15:49 +11:00
Simone Bordet
ae16403239 Merged 'issue_1148' into 'jetty-9.4.x'. 2016-12-08 10:09:57 +01:00
Simone Bordet
a721e8b25d Fixes #1148 - Support HTTP/2 HEADERS trailer. 2016-12-08 10:08:56 +01:00
Greg Wilkins
5186c1e6d0 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-12-08 18:35:40 +11:00
WalkerWatch
4ff441a8b1 Issue #1112 - Doc update. (#1147)
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-08 18:11:07 +11: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
Jan Bartel
51855ba45e Issue #1153 2016-12-08 17:16:27 +11:00
Jan Bartel
8e0725db1c Issue #123
Make sync on id generation more tightly scoped.
2016-12-08 11:29:13 +11:00
Simone Bordet
44c84ffb09 Fixes #1151 - NPE in ClasspathPattern.match(). 2016-12-07 22:28:01 +01:00
Jesse McConnell
f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell
dac1d17a2d Updating to version 9.4.0.v20161207 jetty-9.4.0.v20161207 2016-12-07 09:47:30 -06:00
Jesse McConnell
ae773704ec set for release 2016-12-07 09:45:15 -06:00
Jesse McConnell
be3085d5f7 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-12-07 09:42:00 -06:00
Jesse McConnell
6892f4724a Merge branch 'release-9.4.0.RC3' into jetty-9.4.x 2016-12-07 09:39:49 -06:00