Commit Graph

13628 Commits

Author SHA1 Message Date
Jesse McConnell ecbac9ea55 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-09-02 10:57:30 -05:00
Jesse McConnell 96bde3263a fix up documentation after the docbx-maven-plugin changed where it generated source 2016-09-02 10:57:02 -05:00
Jan Bartel 2b0d364053 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-02 17:29:18 +10:00
Jan Bartel 83c3d6725d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-02 17:28:40 +10:00
Jan Bartel a274d1c17b Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-02 17:28:06 +10:00
Jan Bartel 55a81fd7c6 Issue #899 2016-09-02 17:24:28 +10:00
Greg Wilkins 7f5d354136 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-02 16:07:33 +10:00
Greg Wilkins a01cdf6417 fixed coding standards 2016-09-02 16:07:02 +10:00
Greg Wilkins 3b9db6bcd4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-02 15:54:50 +10:00
Greg Wilkins 8edc5f73a2 fixed javadoc 2016-09-02 15:53:28 +10:00
Jan Bartel 4639aeb536 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-02 15:45:48 +10:00
Jan Bartel 30bf3febdc Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-02 15:45:15 +10:00
Jan Bartel 58c3b30f9e Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-09-02 15:43:31 +10:00
Jan Bartel 9e74080f8b Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-02 15:42:48 +10: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
Jan Bartel 0d6667dc9f Issue #894 2016-09-02 13:50:25 +10:00
WalkerWatch 20cd7bcb35 Resolves #872 and cleans up XML chapter. (#891)
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-02 12:16:19 +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 00fe5d032e simplified fileserver example 2016-09-02 11:57:03 +10:00
Greg Wilkins c52eec226e Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-02 11:23:18 +10:00
Greg Wilkins e261dd0880 Ignore test with fixed port 2016-09-02 11:22:44 +10:00
WalkerWatch b33c463c6e Updating jamon version to 2.81 as part of module revisions in #731. (#895)
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-09-02 10:03:35 +10:00
Greg Wilkins f208b1d46f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-01 17:39:35 +10:00
Greg Wilkins 095a71f11d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-01 17:39:08 +10:00
Greg Wilkins aeeab8d5bb Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-01 17:38:40 +10:00
Greg Wilkins d43b9af428 fix javadoc 2016-09-01 17:38:09 +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
Greg Wilkins 69a817d6d9 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-01 08:30:02 +10:00
Greg Wilkins 90d7e6c43b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-01 08:29:13 +10:00
Greg Wilkins 13696b54f2 Issue #890 Review MappedByteBuffer
Moved newByteBuffer to a default method on ByteBufferPool
preallocate newBuffer function
clear buckets
2016-09-01 08:26:50 +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
Simone Bordet e0c83757aa Fixes #889 - ConstantThrowable.name can be removed. 2016-08-31 12:25:19 +02: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
Jan Bartel c78e0b7565 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-31 16:30:31 +10:00
Jan Bartel 088f19704a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-31 16:30:00 +10:00
Jan Bartel 34d465555b Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-31 16:23:06 +10:00
Jan Bartel c07d842f06 Merge pull request #869 from grgrzybek/jetty-9.2.x-868
Issue #868 - Use static Throwables without backtrace/stackTrace
2016-08-31 15:22:59 +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
Jesse McConnell d85de7d91f Merge pull request #861 from WalkerWatch/issues/860
Resolves #860
2016-08-26 14:34:06 -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