Commit Graph

14366 Commits

Author SHA1 Message Date
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 9a7920a0fb.
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
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
Greg Wilkins 70866690e4 Issue #1270 Avoid GzipHandler rework by DispatcherType exclusion 2017-01-18 14:11:25 +11:00
Greg Wilkins a4dd1672da Fixes #1269 extensible assumed mimetypes 2017-01-18 13:42:42 +11:00
Simone Bordet 4b381b0185 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-17 15:53:37 +01:00
Simone Bordet fc947c92fd Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-17 15:53:13 +01:00
Simone Bordet f6ea2e4fa5 Issue #1073 - JDK9 support in Jetty 9.3.x.
Made module tests work with JDK 9 too.
2017-01-17 15:38:50 +01:00
Simone Bordet efedfb3356 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-17 15:12:42 +01:00
Simone Bordet 9f7e09fa56 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-17 15:12:17 +01:00
Simone Bordet 8532b36c59 Fixes #1265 - JAXB not available in JDK 9.
Added the required "--add-modules java.se.ee" option to the Maven
Surefire Plugin, so that JAXB is available from the JDK runtime.
2017-01-17 15:11:17 +01:00
Simone Bordet 843192efea Merged branch 'jetty-9.4.x' into 'master'. 2017-01-17 11:41:25 +01:00
Simone Bordet f8e3b1f9c2 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-17 11:38:45 +01:00
Simone Bordet 9e9ee03d7f Issue #1073 - JDK9 support in Jetty 9.3.x.
Fixed dependencies for modules that run tests that require ALPN.
2017-01-17 11:32:20 +01:00
Simone Bordet b6e603a467 Issue #486 - JDK 9 ALPN implementation.
Prevented NPEs in case there is no ALPN provider.
2017-01-17 11:31:03 +01:00
Simone Bordet adc6d0ff6d Merged branch 'jetty-9.4.x' into 'master'. 2017-01-17 10:30:07 +01:00
Simone Bordet 80c4be4ea3 Fixes #1244 - ProxyServletFailureTest.testProxyRequestStallsContentServerIdlesTimeout() has TimeoutException visible. 2017-01-17 10:29:20 +01:00
Simone Bordet 4c8441a0df Fixes #1243 - ProxyServletFailureTest.testServerException() results in ServletException. 2017-01-17 10:29:20 +01:00
Greg Wilkins fb8ecf9970 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-17 15:27:22 +11:00
Greg Wilkins 76e9849fcd Issue #1262 Avoid reflection in isMappedBuffer 2017-01-17 15:23:26 +11:00
Simone Bordet 838efa69c4 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-16 19:24:38 +01:00