Commit Graph

3424 Commits

Author SHA1 Message Date
Greg Wilkins 0c6c11d79d Issue #897
If a request is not handled within the scope of the GzipHandler, the gzip interceptor is removed so it cannot be used by any subsequent handlers.
If the request is handled, it is left in place to be used by any async handling.
2016-09-02 12:14:23 +10:00
Greg Wilkins ec5dd51fe1 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-01 16:44:32 +10:00
Greg Wilkins 718c8e2444 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-01 16:44:03 +10:00
Greg Wilkins a799b21eb3 fixed merge 2016-09-01 16:41:49 +10:00
Greg Wilkins c2621bcad6 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-01 16:29:00 +10:00
Greg Wilkins f7c32c5fc7 Issue #882 IPv6 map
The new IPv6 capable InetAddressSet has been added as an alternative for IPAddressMap
The IncludeExclude class has been generalized to IncludeExcludeSet that can have a different
Predicate type to the set type and this works well with InetAddressSet.

However for #881 and #883, this may not be enough and Map semantics may need to be added.

The IPAccessHandler also has path mappings supported, which could need the map semantics, so for now a new InetAccessHandler has been
added that just uses an IncludeExcludeSet<InetAddressSet>, but this has yet to be tested.

The AbstractProxyServlet uses a host:port combinations, so IncludeExcludeSet<InetAddressSet> is not directly applicable.
2016-09-01 16:12:35 +10:00
Joakim Erdfelt 544686255c Merge branch 'jetty-9.4.x' 2016-08-31 10:19:02 -07:00
Greg Wilkins 5ab9846ac5 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-31 20:32:54 +10:00
Greg Wilkins f856107301 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-31 19:05:57 +10:00
Greg Wilkins 0155ae761c Issue #880 Improve IPv6 support
For #880 added the HostPort class, which was used to fix #878, #879, #884 and #886
2016-08-31 16:46:11 +10:00
Jesse McConnell d100ed16a4 Merge branch 'jetty-9.4.x' 2016-08-26 14:37:18 -05:00
Jesse McConnell 174a3bc9be merge 9.3.x 2016-08-26 14:35:49 -05:00
Simone Bordet 0322a1640d Code cleanup. 2016-08-26 12:49:31 +02:00
Simone Bordet 2389b65578 Code cleanup. 2016-08-26 10:45:04 +02:00
Joakim Erdfelt 4c5d0319b1 Minor code cleanup
+ Changed variable from rfc7230 to rfc7239
+ Javadoc updates
2016-08-25 11:40:51 -07:00
Jan Bartel 8eb8ccfb18 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-18 13:24:06 +10:00
Jan Bartel 9aa0371188 Fix javadoc comments 2016-08-18 13:23:38 +10:00
Jan Bartel fe52434d53 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-18 11:21:17 +10:00
Jan Bartel 4ac821d582 Updates to session javadoc 2016-08-18 11:20:45 +10:00
Greg Wilkins 5528dc60f5 Issue #845 data rate limits
Converted to long minimum data rather than the numerically sensitive data rate.
2016-08-17 17:24:57 +10:00
Greg Wilkins 19a20a486d ssue #845 data rate limits
double
2016-08-17 07:11:36 +10:00
Greg Wilkins a60fe5e523 Issue #845 data rate limits
use nanotime
2016-08-16 23:15:30 +10:00
Greg Wilkins d4ebdd6875 Issue #845 data rate limits
added @sbordets feedback
2016-08-16 21:47:49 +10:00
Greg Wilkins 83f503b86f Issue #845 data rate limits
test for variable idle time
2016-08-16 17:40:18 +10:00
Greg Wilkins 34f22dcbce Issue #845 data rate limits
Added data rate unit tests
2016-08-16 17:09:46 +10:00
Greg Wilkins 3d93d39b39 Issue #845 data rate limits
Initial thoughts
2016-08-16 16:24:14 +10:00
Greg Wilkins e34718a806 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-16 00:12:20 +10:00
Greg Wilkins a90e197633 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-16 00:11:48 +10:00
Greg Wilkins 94c1424029 Issue #841 support reset in buffering interceptors
Added resetBuffers to the output interceptor.
2016-08-15 19:38:18 +10:00
Simone Bordet 637fa9ce37 Merged branch 'jetty-9.4.x' into 'master'. 2016-08-12 14:58:20 +02:00
Simone Bordet 6f20feddcb Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-12 14:57:47 +02:00
Simone Bordet 9f9e9ecaf9 Changes for Issue #824 (#825)
* Issue #824 - Implement notifications of asynchronous error conditions for HTTP/2.

Introduced new method HttpChannelState.asyncError() to be called in
case of asynchronous errors, i.e. those errors that do not happen in
the HttpChannel.handle() loop.

Implemented HTTP/2 callbacks to call HttpChannelState.asyncError()
and plug in the existing error handling mechanism.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Issue #824 - Implement notifications of asynchronous error conditions for HTTP/2.

Improved implementation to ignore idle timeouts for streams and
session in case that requests are being handled, matching the HTTP/1.1
behavior.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2016-08-12 11:02:52 +02:00
Greg Wilkins 6828be658f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-12 11:47:56 +10:00
Greg Wilkins 20fd9c08b0 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-12 11:44:45 +10:00
Greg Wilkins 5fefd5d8bd Issue #185 Implement RFC 7239
Improved test harness
Added more configurability
Fixed SSL session and certificate bugs
2016-08-12 11:39:36 +10:00
Greg Wilkins 5c9a637d4f UnitTest #833 2016-08-12 10:29:38 +10:00
Greg Wilkins cafc0f7210 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-12 08:01:41 +10:00
Greg Wilkins d45ebcb2bf Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-11 19:14:34 +10:00
Greg Wilkins b45af1a3c9 Issue #185 Implement RFC 7239
Also handle legacy Https headers for #834
2016-08-11 18:56:51 +10:00
Greg Wilkins 923f8d5a37 updated test 2016-08-11 08:40:26 +10:00
Greg Wilkins 352e9ce57e Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-10 16:28:31 +10:00
Greg Wilkins 07f547782f Cleanup metadata and HttpURI usage 2016-08-10 16:28:05 +10:00
Greg Wilkins 08b9ac6b27 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-10 16:27:22 +10:00
Greg Wilkins f493e0f528 remove println 2016-08-10 16:26:43 +10:00
Greg Wilkins cc8c3590c0 Issue #786 Buffering Response Handler
Fixed commit of empty buffers
2016-08-10 16:01:56 +10:00
Greg Wilkins 0c68ab1508 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-05 09:19:13 +10:00
Greg Wilkins f0bd6ceb8d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-05 08:56:05 +10:00
Andriy Rosa 1d968ef53a HttpOtput: fix async write for heap ByteBuffer (#811)
* Remove unused imports

Signed-off-by: arhimondr <andriyrosa@gmail.com>

* Improve HttpOtputTest

HttpOutputTest gives false positive results for couple of tests
(testAsyncWriteBufferLargeHEAD, testAsyncWriteBufferLarge). This happens
because only the tail of the response is being checked, and that fact that
the beginning of the response in not being sent is ignored.

For regular encoding responses it is easy to check that the entire content is
received by checking it with `response.endWith(expectedContent)`. However
for chunked responses extra parsing is required to check the content in such way.
For the sake of code simplicity only start and end of the response is being checked
for the chunked encoded responses.

Signed-off-by: arhimondr <andriyrosa@gmail.com>

* Add testAsyncWriteBufferLargeDirect test to HttpOutputTest

Just to verify that everything is right when sending native buffers
asynchronously instead of heap ones.

Signed-off-by: arhimondr <andriyrosa@gmail.com>

* HttpOtput: fix async write for heap ByteBuffer

Fix bug when asynchronous writes of Heap ByteBuffer were ignored.

ByteBuffer position was moved to the end in the constructor,
then in the `process` method `if (_buffer.hasRemaining())` condition
was always evaluated to `false` and the actual write was not performed.

Add assertion in `HttpOutputTest` to verify that after the asynchronous
write position of the buffer is always at the end.

Signed-off-by: arhimondr <andriyrosa@gmail.com>
2016-08-05 08:51:10 +10:00
Greg Wilkins e33b549c7f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-03 18:49:48 +10:00
Greg Wilkins d0101dc81a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-03 18:01:42 +10:00
Greg Wilkins d57a11668d Issue #798 Sporadic async IO failure 2016-08-03 17:22:31 +10:00
Greg Wilkins 764307b9a7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-02 13:59:01 +10:00
Greg Wilkins a7a52e04c9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-02 13:58:15 +10:00
Greg Wilkins 83483e1f69 Response.reset does not clear session cookie #789
Added unit test
2016-08-02 13:49:05 +10:00
Greg Wilkins 4bbbde04ec Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-29 18:06:29 +10:00
Greg Wilkins 06a40e919a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-29 18:03:27 +10:00
Greg Wilkins e0a1a1988f Response.reset does not clear session cookie #789 2016-07-29 16:45:09 +10:00
Greg Wilkins ad93923e1d Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-07-29 16:43:04 +10:00
Greg Wilkins 23cb28e856 improved debug logging of request/response 2016-07-29 12:34:12 +10:00
Joakim Erdfelt 2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00
Greg Wilkins 7d4a509462 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-28 18:45:47 +10:00
Greg Wilkins a415e72e2d Fixed Debug NPE #754
Fixed the fix
2016-07-28 18:29:21 +10:00
Jan Bartel 525fabd9aa Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-28 15:12:36 +10:00
Jan Bartel e45e649761 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-28 15:06:12 +10:00
Greg Wilkins ffb52a948b Buffering Response Handler #786 2016-07-28 15:05:44 +10:00
Greg Wilkins 162d6fc722 Revert "HttpURI cleanup"
This reverts commit 0913e7d7da.
2016-07-27 20:45:34 +10:00
Jan Bartel 7669ea0365 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-27 20:34:47 +10:00
Greg Wilkins 2f1d2dac72 Fixed Debug NPE #754 2016-07-27 17:46:41 +10:00
Greg Wilkins edf1d5b212 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-27 14:14:56 +10:00
Greg Wilkins 4cd51c43a1 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-27 14:14:34 +10:00
Greg Wilkins 32e2ee8cb9 start property for stopTimeout #774 2016-07-27 14:12:46 +10:00
Greg Wilkins e93fa6c141 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-27 10:39:37 +10:00
Greg Wilkins fdc8059d2c Fix NCSA request log in case of missing useragent. (#770)
Updated to use getResponse
2016-07-27 10:38:22 +10:00
Greg Wilkins 8d380220c4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-27 10:35:37 +10:00
Greg Wilkins 0913e7d7da HttpURI cleanup 2016-07-27 10:35:35 +10:00
Niels Basjes 117cbc2bd1 Fix NCSA request log in case of missing useragent. (#770)
Signed-off-by: Niels Basjes <niels@basjes.nl>
2016-07-27 10:32:31 +10:00
Niels Basjes c8c253d6ae Fix NCSA request log in case of missing useragent. (#770)
Signed-off-by: Niels Basjes <niels@basjes.nl>
2016-07-27 10:31:11 +10:00
Joakim Erdfelt 64faccfda6 Fixing javadoc error 2016-07-26 14:48:54 -07:00
Joakim Erdfelt 5433041e5a Fixing refid 2016-07-26 14:48:40 -07:00
Joakim Erdfelt a0d866687f Merge branch 'jetty-9.4.x' 2016-07-25 17:03:11 -07:00
Joakim Erdfelt 87c8e1c019 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-25 17:02:51 -07:00
Greg Wilkins e53ea55f48 Issue #752 SETTINGS_MAX_HEADER_LIST_SIZE
Defined missing status codes (removed old/wrong javadoc)
Changed use of 413 to 431
Received SETTINGS_MAX_HEADER_LIST_SIZE is set on hpack encoded and warning generated only for large responses.
2016-07-23 12:17:50 +10:00
Jan Bartel 92e91e8695 Revert "Issue #759"
This reverts commit 7b6bf03133.
2016-07-22 16:10:37 +10:00
Jan Bartel 7b6bf03133 Issue #759 2016-07-22 15:50:17 +10:00
Joakim Erdfelt 6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt 9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
Joakim Erdfelt 0b18340179 Updating to version 9.2.19-SNAPSHOT 2016-07-21 13:10:23 -07:00
Joakim Erdfelt d3ff3423f0 Updating to version 9.2.18.v20160721 2016-07-21 12:35:26 -07:00
Simone Bordet 41315abca3 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-21 18:50:54 +02:00
Simone Bordet 5e3269d3b6 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 18:50:33 +02:00
Simone Bordet 71eaacf855 Fixed Javadocs. 2016-07-21 18:48:44 +02:00
Simone Bordet 98454b8726 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-21 17:50:51 +02:00
Simone Bordet cf0ecbd88f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 17:50:08 +02:00
Greg Wilkins f3efded065 Servlet 4.0 getMappings rough implementation #746 2016-07-21 17:07:10 +10:00
Greg Wilkins b8b9d222eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-21 16:50:27 +10:00
Greg Wilkins 3c0859d034 improve commit debug 2016-07-21 15:59:27 +10:00
Greg Wilkins f902181a83 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-21 13:02:57 +10:00
Greg Wilkins 5718726a8c Incorrect default ALPN protocol #671
Correctly handle protocol aliases
2016-07-21 13:01:25 +10:00
Jesse McConnell 7346476c92 Merge branch 'jetty-9.4.x' 2016-07-20 15:18:23 -05:00
Jesse McConnell 4a2d471537 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-20 15:17:57 -05:00
Greg Wilkins e82ed5afb9 Fix #671 Incorrect default ALPN protocol 2016-07-20 23:16:50 +10:00
Simone Bordet f068780749 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-20 13:19:15 +02:00
Greg Wilkins 0a7903485a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-20 17:01:21 +10:00
Greg Wilkins 7e16731b9d fix #592 2016-07-20 16:59:28 +10:00
Trevor Pounds 60528537c3 Support direct byte buffers. (#348)
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>

I think it is still too coarse, but it is better than hard coded
2016-07-20 14:22:03 +10:00
Greg Wilkins 53c07a5a83 Servlet 4.0 getMappings rough implementation #746 2016-07-20 13:58:19 +10:00
Jan Bartel 75f4af1355 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-20 12:47:44 +10:00
Jan Bartel 6de88fcee9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-20 12:33:39 +10:00
Greg Wilkins 549bed7540 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-20 11:44:34 +10:00
Greg Wilkins 25341e9ac4 Calling onWritePossible in race with write #730
This commit cleans up the combination of the prior fix to #730 in 0433a8c
and the prior cleanup in 86ff9f9.   More comments have been added to explain.
2016-07-20 11:10:52 +10:00
Greg Wilkins 5afbcd4c6a Allow setCharacterEncoding after getOutputStream #733 2016-07-20 09:56:25 +10:00
Simone Bordet 491be7505b Merged branch 'jetty-9.4.x' into 'master'. 2016-07-19 10:34:59 +02:00
Greg Wilkins 86ff9f984d fixed noisy/broken tests 2016-07-19 15:16:14 +10:00
Greg Wilkins 95d77f90c1 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-19 08:49:13 +10:00
Greg Wilkins cca9027285 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-19 00:55:13 +10:00
Greg Wilkins 35bb6620a1 Extensible ErrorHandler for different mimetypes #230 2016-07-18 21:12:48 +10:00
Greg Wilkins 3765efad2b Extensible ErrorHandler for different mimetpyes #727 2016-07-18 11:38:10 +10:00
Jesse McConnell 0c1cfb350c Merge branch 'jetty-9.4.x' 2016-07-15 14:32:56 -05:00
Jesse McConnell 8718f4e1bf Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-15 14:32:30 -05:00
Jesse McConnell 1e3cef80ee Merge pull request #735 from WalkerWatch/jetty-9.3.x
Updated RequestLog xml/module/documentation. Resolves #734
2016-07-15 14:32:03 -05:00
WalkerWatch 00b3738536 Updated RequestLog xml/module/documentation. Resolves #734
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-15 13:08:30 -04:00
Simone Bordet a1cc30c751 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-15 18:12:46 +02:00
Simone Bordet 6adb5eb031 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-15 18:12:02 +02:00
Simone Bordet 0433a8ca73 Issue #730 - "Slow" client causes IllegalStateException.
Fixed by allowing state ASYNC to call onWritePossible().
2016-07-15 18:11:28 +02:00
Greg Wilkins 5b892f35c5 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-13 11:13:40 +10:00
Greg Wilkins 9c881525b7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-13 11:12:33 +10:00
Greg Wilkins 4055146dcd Fix #671 Incorrect default SLPN protocol 2016-07-13 11:09:53 +10:00
Joakim Erdfelt ba761071f3 Merge branch 'jetty-9.4.x' 2016-07-12 17:50:37 -07:00
Joakim Erdfelt 232a077b9d Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 17:50:16 -07:00
Joakim Erdfelt 35de3899b6 Issue #706 - Removing org.apache.jasper.compiler.disablejsr199 references 2016-07-12 17:49:11 -07:00
Joakim Erdfelt c3bcce1ce4 Merge branch 'jetty-9.4.x' 2016-07-12 11:44:57 -07:00
Joakim Erdfelt bdefbdfcf0 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 11:44:16 -07:00
Joakim Erdfelt 0e6833b770 Issue #687 - Simplifying AllowSymLinkAliasChecker logic 2016-07-12 11:39:58 -07:00
Joakim Erdfelt 7ec1f26d1a Merge branch 'jetty-9.4.x' 2016-07-11 10:32:44 -07:00
Joakim Erdfelt bc9007a9ed Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-11 10:32:33 -07:00
Joakim Erdfelt 596e372c7a Fixes #687 - Normalizing resolved symlinks 2016-07-11 10:31:07 -07:00
Joakim Erdfelt 2cfc5b1665 Merge branch 'jetty-9.4.x' 2016-07-08 08:40:28 -07:00
Joakim Erdfelt 369a105524 Issue #695 - Flagging with method level @Deprecated for improved IDE experience 2016-07-08 08:38:43 -07:00
Greg Wilkins 16c43727bf Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-08 21:19:53 +10:00
Greg Wilkins adf3281ba8 Issue #696 Improve testing of LocalConnector
Fixed some races in the implementation
2016-07-08 21:15:36 +10:00
Greg Wilkins 0d74658ab6 fixed bad tests 2016-07-08 13:37:41 +10:00
Joakim Erdfelt 294362954d Merge branch 'jetty-9.4.x' 2016-07-07 13:43:16 -07:00
Joakim Erdfelt 5c6e271b2c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-07 13:43:01 -07:00
Joakim Erdfelt 602222182c Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-07-07 09:12:09 -07:00
Joakim Erdfelt a6276c3017 Issue #687 - Adding AllowSymLinkAliasCheckerTest
+ Replicated, in test case form, the example present in the
  filed issue.  All tests pass.
2016-07-07 09:11:19 -07:00
Greg Wilkins 5d77bb4d8f fixed bad unit test 2016-07-08 00:30:53 +10:00
Greg Wilkins e38ec83de9 Issue #695 use the getResponse methods 2016-07-07 18:13:44 +10:00
Greg Wilkins a40002bd74 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 16:37:45 +10:00
Greg Wilkins 183e3acabb Issue #695 improve getResponse methods 2016-07-07 16:36:46 +10:00
Jan Bartel c3da8b27eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-06 13:43:52 +10:00