3531 Commits

Author SHA1 Message Date
Simone Bordet
bdf26da0c0 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-05 23:12:44 +02:00
Simone Bordet
e21ad09e3a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-05 23:09:12 +02:00
Simone Bordet
89b20b4692 Merged branch 'jetty-9.3.x-845'. 2016-09-05 21:36:04 +02:00
Simone Bordet
705a68dfc4 Issue #845 - Improve blocking IO for data rate limiting.
Moved tests to run HTTP and HTTP/2 tests, and added more test cases.
2016-09-05 19:13:05 +02:00
Greg Wilkins
32f1b30901 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-02 14:58:08 +10:00
Greg Wilkins
25574d2843 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-02 14:57:44 +10:00
Greg Wilkins
1f7c5a5b20 Issue #898
Added addCSV method to HttpFields to more efficiently add values to a CSV field without duplicates.
Improved usage of QuotedCSV and removed older parsing

Used new method in GazipHttpOutPutInterceptor to avoid duplicate Vary fields
2016-09-02 14:57:13 +10:00
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