Simone Bordet
9ae93c19ca
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-20 12:20:21 +01:00
Simone Bordet
51f68dc57e
Issue #1229 - ClassLoader constraint issue when using NativeWebSocketConfiguration with WEB-INF/lib/jetty-http.jar present.
...
Introduced String-based APIs to specify mappings, to avoid the
classloader issue.
2017-01-20 11:34:29 +01:00
Simone Bordet
a205fb3aae
Fixes #1276 - Remove org.eclipse.jetty.websocket.server.WebSocketServerFactory from SPI.
2017-01-20 09:55:01 +01:00
Greg Wilkins
30bb2b4193
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-20 15:58:26 +11:00
Greg Wilkins
389ef2a2a3
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-20 15:57:33 +11:00
Greg Wilkins
f9c829f7cc
Issue #1269
...
report inferred encoding
2017-01-20 11:38:21 +11:00
Greg Wilkins
91987d4233
Issue #1269
...
Stop call to getCharacterEncoding forcing a choice.
2017-01-20 11:18:23 +11:00
Simone Bordet
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
Simone Bordet
033c4fae70
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-19 19:28:07 +01:00
Simone Bordet
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
Simone Bordet
d18f32f139
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-19 19:20:46 +01:00
Simone Bordet
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
Simone Bordet
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03ddda3776f3db71e28e55312b1c982092, reversing
changes made to 4565c186d7491a97d72217a96e86b15ced506de6.
2017-01-19 18:26:43 +01:00
Simone Bordet
dc1658fad3
Revert "resolve merge and update license headers"
...
This reverts commit 3c53b3a32f5d47c665f471b10ef5ff25ebb3d5a2.
2017-01-19 18:26:10 +01:00
Jesse McConnell
3c53b3a32f
resolve merge and update license headers
2017-01-19 09:38:22 -06:00
Jesse McConnell
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
Jesse McConnell
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
Simone Bordet
cf46ad473b
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-19 15:22:40 +01:00
Simone Bordet
4e0800fa5a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-19 15:22:16 +01:00
Simone Bordet
4565c186d7
Fixes #1277 - http2 alpn test error.
2017-01-19 15:18:55 +01:00
Jan Bartel
a2cde42a68
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-19 14:55:54 +11:00
Jan Bartel
7fd8036f93
Issue #1271
...
Update to org.mortbay.jasper 8.5.9.1
2017-01-19 14:52:51 +11:00
Jan Bartel
46668d5a66
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-19 13:54:22 +11:00
Jan Bartel
1ecaac9383
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-19 13:53:51 +11:00
Jan Bartel
edfd05dd9c
Issue #1268
...
Add unit tests, tweak log and error messages, fix bug.
2017-01-19 13:49:50 +11:00
Jan Bartel
d33f42fbab
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-19 10:26:11 +11:00
Jan Bartel
255ae29e2a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-19 10:25:13 +11:00
Jan Bartel
eeae3bfdad
Issue #1274
2017-01-19 10:24:31 +11:00
Simone Bordet
0d8d754772
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-18 18:55:08 +01:00
Simone Bordet
a7938910b7
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-18 18:54:47 +01:00
Simone Bordet
53281d3202
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-18 18:52:20 +01:00
Simone Bordet
79202d1cc6
Updated ALPN version for JDK 8u121.
2017-01-18 18:30:30 +01:00
Simone Bordet
a49841f308
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-18 17:28:36 +01:00
Simone Bordet
6222ccba14
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-18 17:28:18 +01:00
Simone Bordet
d8aafea4b4
Fixes #1272 - Update ALPN versions for 8u111.
...
Updated ALPN table for 8u111 and 8u112.
2017-01-18 17:14:23 +01:00
Simone Bordet
f97396b131
Fixes #1275 - Get rid of Mockito.
...
Converted the 2 tests that were using Mockito and removed from the POMs.
2017-01-18 17:09:57 +01:00
Jan Bartel
608a33bbad
Revert "Issue #1271 "
...
This reverts commit 9a7920a0fb856d8b8fbd46ea62629dd71554102b.
2017-01-19 00:22:42 +11:00
Simone Bordet
b2876f2bca
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-18 10:42:57 +01:00
Simone Bordet
6ab0e71b38
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-18 10:42:23 +01:00
Simone Bordet
732277c002
Converted IOException to EofException in case of client close or reset.
...
It's common for a client to either close the connection or reset a
stream, so EofException is a better exception to report since it will
be logged at DEBUG level by the server, reducing the noise in the logs.
2017-01-18 10:41:01 +01:00
Jan Bartel
c6fa0cdd69
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-18 17:28:21 +11:00
Jan Bartel
65987b03ba
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-18 17:27:53 +11:00
Jan Bartel
ae0a8c7f2b
Issue #1267
2017-01-18 17:26:23 +11:00
Jan Bartel
4b2b5e0eed
Issue #1267
2017-01-18 17:24:20 +11:00
Jan Bartel
9a7920a0fb
Issue #1271
2017-01-18 15:38:30 +11:00
Jan Bartel
76df903feb
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1150
2017-01-18 15:25:21 +11:00
Greg Wilkins
80163993aa
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-18 15:24:26 +11:00
Greg Wilkins
2a3c367f55
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-18 15:21:05 +11:00
Jan Bartel
69afe33b82
Issue #1268
2017-01-18 15:16:52 +11:00
Greg Wilkins
c6e910cf12
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-18 14:39:20 +11:00
