Joakim Erdfelt
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
Simone Bordet
e78c117c01
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-11-14 22:30:08 +01:00
Simone Bordet
5e5d6913e6
Fixes #1099 - PushCacheFilter pushes POST requests.
2016-11-14 22:28:27 +01:00
Greg Wilkins
6781a949b1
Issue#1066 Simplify HttpGeneration
...
Reduce the transformations needed on header fields, so they can be more often
set directly and no need to split and recombine.
The Content-Length field is added IF it is needed for framing or if it was explicitly set
The Transfer-Encoding: chunk field is used only as a hint that there is content.
Connection fields are used as is, but are checked for close and keep-alive
2016-11-03 16:55:33 +11:00
Jan Bartel
7790234589
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-11-02 15:42:03 +11:00
Jan Bartel
ca882c8dee
Issue #240
...
No error if no parts because input stream already consumed.
2016-11-02 15:40:59 +11:00
Jan Bartel
96804627ee
480764 Suppress stacks in multipart filter tests
2016-10-28 14:54:40 +11:00
Jan Bartel
da853574f6
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-28 14:41:37 +11:00
Jan Bartel
6f6ccdf061
480764 Add extra tests for empty multipart.
2016-10-28 14:41:05 +11: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
Simone Bordet
42b16e9785
Merged branch 'jetty-9.2.x' into 'jetty-9-3-x'.
2016-07-21 17:49:37 +02:00
Simone Bordet
ccff4b8346
Fixes #756 - Filter out headers.
2016-07-21 17:42:48 +02:00
Simone Bordet
76a362d9ad
Code cleanups.
2016-07-21 17:42:48 +02:00
Greg Wilkins
53c07a5a83
Servlet 4.0 getMappings rough implementation #746
2016-07-20 13:58:19 +10:00
Joakim Erdfelt
294362954d
Merge branch 'jetty-9.4.x'
2016-07-07 13:43:16 -07:00
Greg Wilkins
4ca62d8995
updated starvation test for extra low resources thread
2016-07-08 00:12:04 +10:00
Greg Wilkins
e38ec83de9
Issue #695 use the getResponse methods
2016-07-07 18:13:44 +10:00
Jan Bartel
e64b4ecf60
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-07 14:33:13 +10:00
Jan Bartel
6b778f9f0e
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-07 14:32:18 +10:00
Joakim Erdfelt
650db59e69
Fixes #693 - QoSFilterTest failures are not capture by junit
...
+ Switching from Workers from Runnables to Callables
+ Using ExecutorService to execute Workers
+ Using Futures to report exceptions in Workers to the junit
Test Runner
2016-07-06 16:27:31 -07:00
Greg Wilkins
a5ad291add
Squashed commit of the following: ( #528 )
...
commit 4bf6b7c951
Merge: a50e882
301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 27 12:12:08 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit a50e8825a3
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 23 09:38:00 2016 +1000
work in progress
commit 4e286266c0
Merge: 5ae7da0
f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 16:34:12 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 5ae7da049b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 12:12:24 2016 +1000
Work in progress on Features
commit adfc430ad4
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 22:05:55 2016 +1000
Refactor Configurations.isEnabledByDefault, enable all configurations by default.
commit 70cca692cc
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 17:32:22 2016 +1000
Fix features for jsp with osgi
commit 22d2b251e9
Merge: 571d503
2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 14 16:19:43 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 571d50315e
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 13 15:36:36 2016 +1000
code comment
commit d9b229f298
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 9 21:24:22 2016 +1000
fixed quickstart validation
commit 154d58bf62
Merge: 8e54aad
ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:25:17 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 8e54aad414
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:21:30 2016 +1000
general cleanup of Configuration and ClasspathPattern usage
commit 65f8e5dbd0
Merge: ea1deda
2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 09:15:28 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit ea1deda4f9
Merge: cfe9c83
f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 18:21:56 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit cfe9c83691
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 17:57:23 2016 +1100
work in progress
commit 725be8c051
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 10:11:49 2016 +1100
work in progress
commit 61d2c07534
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 14:01:00 2016 +1100
progress on OSGi
commit a977536c7d
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:52:33 2016 +1100
Fixed plugin
commit f08b84ba0e
Merge: f19bd2c
8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:55 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit f19bd2c65a
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:06 2016 +1100
work in progress... all but OSGi
commit 2f15c3e4f9
Merge: 36b5687
7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 16:52:43 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 36b5687329
Merge: 13d914a
e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 07:20:05 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 13d914aa7c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 04:41:30 2016 +1100
Work in progress on Features
Moved jar discovery to META-INF
commit d41bd264ad
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 17:48:15 2016 +0100
Work in progress towards new quickstart arch
commit c5c23698c4
Merge: fd34007
692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:29:18 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit fd34007c3d
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:04:35 2016 +0100
Work in progress on Features for QuickStart
commit c5f0c80cd2
Merge: 0e6d886
b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 4 16:05:23 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 0e6d886b01
Merge: d150405
2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 17:32:36 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit d1504055de
Merge: 22a6cd0
3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 15:21:20 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 22a6cd05b7
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 20:53:17 2016 +0100
Features work in progress
convert more server/system classes to Configurations
commit 037e04bfe5
Merge: add9876
bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 17:11:04 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit add9876f83
Merge: 5263f15
eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Feb 25 10:11:08 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5263f15acd
Merge: 89803ae
21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 23 14:35:31 2016 +0100
Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature
commit 89803aec95
Merge: 5fed7c7
779317d
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 16:09:38 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5fed7c713f
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 11:21:13 2016 +0100
fixed merge
commit ec22a1ba0b
Merge: 4c8257d
d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 10:53:16 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 4c8257d23b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 17 09:34:28 2015 +1100
Do not default quickstart
commit 57ce87770a
Merge: 14bde1f
96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 16 17:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 14bde1f696
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 16:26:58 2015 +1100
work in progress on Configurations as services
commit 46ce2aef3a
Merge: 9e82fa0
ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 10:11:09 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 9e82fa0a22
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 08:52:37 2015 +1100
work in progress to Configurations as ServiceLoader
commit 6e11f22de4
Merge: 120e330
5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 18:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 120e33034f
Merge: 6c5b95d
384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 14:20:52 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 6c5b95d6b8
Merge: 722eb60
5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 2 11:16:37 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 722eb60ce5
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 13:58:16 2015 +1100
Configurations can add server/system classes
commit 2972354db7
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 11:47:03 2015 +1100
Self ordering WebApp Configurations
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-05-02 17:55:54 +10:00
Mikko Tiihonen
3261e03edb
Support for configurable set of precompressed static resources
...
* Support for configurable set of precompressed static resources
Signed-off-by: Mikko Tiihonen <mikko.tiihonen@nitorcreations.com>
* Use QuotedQualityCSV to parse preferred content encodings
Signed-off-by: Mikko Tiihonen <mikko.tiihonen@nitorcreations.com>
2016-04-07 13:57:00 +10:00
Simone Bordet
68747ca316
Merged branch 'jetty-9.3.x' into 'master'.
2016-03-30 19:09:38 +02:00
Simone Bordet
86f3947378
Issue #454 - DoSFilter does not send an error status code when closing a connection, because of timeout.
...
Introduced onRequestTimeout() to deprecate closeConnection() since
the method was wrongly named.
Now onRequestTimeout() performs a sendError(503) to signal that the
request timed out, rather than responding with 200 OK.
Cleaned up tests.
2016-03-30 19:08:32 +02:00
Joakim Erdfelt
3624339ec6
Merge branch 'jetty-9.3.x'
2016-03-16 10:29:29 -07:00
Greg Wilkins
1c5a1fc6a2
Issue #431
...
Suppress stack traces from unit tests
2016-03-16 18:19:40 +11:00
Jan Bartel
9b5aa6f90d
478918 Change javax.servlet.error,forward,include literals to RequestDispatcher constants
2016-02-16 11:52:29 +01:00
Jan Bartel
f10f32c080
478918 Change javax.servlet.error,forward,include literals to RequestDispatcher constants
2016-02-16 10:48:20 +01:00
Simone Bordet
f727e2bac3
Merged branch 'jetty9.3.x' into 'master'.
2016-02-13 11:32:53 +01:00
Simone Bordet
0eef227e84
487750 - HTTP/2 push must not be recursive.
...
Avoid recursive pushes by pushing the whole resource tree on the
primary request, and avoid pushes for synthetic requests generated by
the pushes.
2016-02-13 11:15:58 +01:00
Simone Bordet
cb79379b79
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-05 18:14:56 +01:00
Jan Bartel
dd2e042ddf
Revert "486394 - Restore MultiPartFilter behavior with regards to temp file access"
...
This reverts commit 009fde2400
.
2016-02-04 08:41:14 +01:00
Greg Wilkins
df79ad689a
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-02-04 07:00:13 +01:00
Joakim Erdfelt
009fde2400
486394 - Restore MultiPartFilter behavior with regards to temp file access
...
+ Adding HttpServletRequest.getParts() demonstration of duplicate name="" entries
+ Adding 2 new testcases in MultipartFilterTest demonstrating
location/temp file access issue (currently @Ignored)
2016-02-03 08:19:37 -07:00
Jan Bartel
1b7045babd
486394 Make old behaviour of MultiPartInputStreamParser configurable
2016-02-03 14:15:15 +01:00
Greg Wilkins
6c9a444b6c
486530 - Handler added to WebAppContext prevents ServletContext initialization
...
Added warnings for loops and inappropriate handlers.
Used insertHandler in more XML files
2016-02-03 10:54:39 +01:00
Joakim Erdfelt
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
Joakim Erdfelt
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
Joakim Erdfelt
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
Greg Wilkins
133e9e054d
Merge remote-tracking branch 'origin/jetty-9.3.x'
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
2015-12-18 12:50:19 +11:00
Greg Wilkins
5cd676581c
484622 - Improve handling of Direct and Mapped buffers for static content
...
ResourceHttpContent now applies a maxBufferSize that is passed through the call to getContent
ResourceCache now accounts for the exact memory usage of content, which may have an indirect
buffer plus either a direct or mapped buffer. Thus content size may be 0, 1 or 2 times the
file size.
Some more limited unit tests
2015-12-18 12:36:27 +11:00
Joakim Erdfelt
6e0ad429d9
484350 - Allow GzipHandler path include/exclude to use regex
...
+ Overhauled IncludeExclude to use java 8 predicate
+ Introduced PathSpecSet to standardize path IncludeExclude
+ GzipHandler now uses PathSpecSet for paths
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java
jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
2015-12-15 15:23:29 -07:00
Joakim Erdfelt
bf104f71ab
GzipHandler Deprecations and User-Agent
...
+ Adding javadoc @deprecated for deprecated methods
+ Adding exclude support for user-agent
2015-12-08 18:40:48 -07:00
Joakim Erdfelt
5e3fbbccd0
Backporting GzipHandler's IncludeExclude configs
2015-12-08 15:51:25 -07:00
Joakim Erdfelt
7cdc58e6b9
Merge branch 'jetty-9.2.x' into feature/gziphandler-config
2015-12-08 14:56:26 -07:00
Greg Wilkins
3527c6a71b
StringUtil.csvSplit(String)
...
Conflicts:
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
2015-12-08 14:54:33 -07:00
Simone Bordet
657b570716
482243 Fixed GzipHandler for Include.
...
Because AbstractCompressedStream is a jetty-servlets class that can
be included in web applications, it cannot reference server classes
such as Response.
The check for inclusion is now done by looking at the dispatcher type.
2015-12-08 21:57:04 +01:00
Joakim Erdfelt
1e6b940942
Merge branch 'jetty-9.3.x'
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
2015-12-02 11:39:52 -07:00
Greg Wilkins
1bd0602c9f
483413 - Warn on @Deprecated servlet/filter use
2015-12-02 12:57:54 +11:00
Greg Wilkins
8030a4c783
482243 Fixed GzipHandler for Include
2015-11-18 15:44:36 +11:00
Greg Wilkins
ff0d1b4c14
481903 Module Descriptions
2015-11-12 10:48:04 +11:00
Greg Wilkins
7843b7348e
480827 Implemented Unix Domain Socket Connector
...
Squashed commit of the following:
commit fbb680ba7cdb73495524ea9e5b0f49caee7f68d8
Merge: ed2550b 64ea0db
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 6 10:44:00 2015 +1100
Merge branch 'master' into unix-socket
commit ed2550b50f978e1984e19fbda642baf450dbe6a1
Merge: 88d7b35 de137ab
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Nov 5 18:41:25 2015 +1100
Merge branch 'master' into unix-socket
commit 88d7b35f885de2da7dec836e6e4ae2b522d517f0
Merge: 7d4155f 3e2658a
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Nov 5 17:38:27 2015 +1100
Merge branch 'master' into unix-socket
commit 7d4155fe4a407d493683b66709bc638879b0b422
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Nov 5 17:24:48 2015 +1100
Unix socket configuration
commit 2737b19f73ad153c20e1762874558a5d62849f90
Merge: cd0cc2e 92cc44c
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Nov 4 15:13:40 2015 +1100
Merge branch 'master' into unix-socket
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java
commit cd0cc2ef36a558d948bf26aff4f9e3519da2f823
Merge: 639753b 303f98e
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Nov 2 12:21:19 2015 +1100
Merge branch 'master' into unix-socket
commit 639753b5ed37778d7231acfe9d52039aed66351e
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 15:42:58 2015 +1100
local connectors report NOIP address
commit 6d38c4195f145b99f775a06d546960b119094b0c
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 12:11:13 2015 +1100
Gentler ssl close test
commit 40b46b66a738c9187f859d522a0165bb09b113c8
Merge: b7eb082 fa53b11
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 11:09:42 2015 +1100
Merge branch 'master' into unix-socket
commit b7eb082be44864c058b6f01b10364013596d3650
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 08:34:30 2015 +1100
SecureRequestCustomizer for UnixSockets
commit edbb3c080200b4c6aa2836eff6c81bf31a73a8c1
Merge: 90e8cc0 de7ac72
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 29 19:47:05 2015 +1100
Merge branch 'master' into unix-socket
commit 90e8cc060ff6dc4b249818db38334ffa543f002f
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 29 19:31:50 2015 +1100
use proxy connection
commit b1772ef5dcac9ddf9bb5ecda1cda6d038ca21755
Merge: e95a932 9fe7332
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 29 16:46:29 2015 +1100
Merge branch 'master' into unix-socket
commit e95a932bda5a96bf98ada4fb47664790af2aa0a2
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Oct 28 15:58:25 2015 +1100
fixed config
commit f8963b2ed6b6b4b96f1d9403194c9d50ab1f12fd
Merge: 9c56b53 8b27484
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Oct 28 15:34:28 2015 +1100
Merge branch 'master' into unix-socket
commit 9c56b53cbec20d98e5cb05cf8d1f668fe84b95e0
Merge: 298a311 39768f8
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Oct 26 13:04:34 2015 +1100
Merge branch 'master' into unix-socket
commit 298a311af952ad3ef5d1c7635deabf47bddaa1c6
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 15:24:19 2015 +1100
Async accepting
commit 8266753d124c04ec8bca8aa02be1ef3d826d6769
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 14:45:35 2015 +1100
set acceptors
commit 6a56c5b9e19063fcb95cdc1228adf723c0d41362
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 11:44:54 2015 +1100
licence
commit d80e5748e6c4327bae57de2af01983990dd2afe0
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 11:24:14 2015 +1100
unixsocket work in progress adding modules
commit cf0c1153d9966cc7182ba29411527b4341c34da6
Merge: 645b671 c39bfa2
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 08:52:01 2015 +1100
Merge branch 'master' into unix-socket
commit 645b6712d37282c26011a95c8c98e45c249b2e5f
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 08:49:52 2015 +1100
IP headers
commit 67b210b9ea81af68ce3848a114bbbd1b80a8ca52
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 22 23:48:57 2015 +1100
working with haproxy
commit e4fce9cf5d896a9a29a7c6280fcaa0336dfcc0f2
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 22 18:25:09 2015 +1100
unixsocket working
commit 6f013788cad44e6641cd89720c5e7f3652cdc257
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 22 15:39:55 2015 +1100
work in progress
2015-11-06 11:17:46 +11:00
Simone Bordet
5062756135
Merged branch 'jetty-9.3.x' into 'master'.
2015-11-02 12:17:00 +01:00
Simone Bordet
58027a3421
481225 - Secondary resources with query parameters are not properly pushed.
...
Fixed by making PushCacheFilter remember the query parameters for
secondary resources, so that the PUSH_PROMISE frame can be correctly
generated with the query parameters.
2015-11-02 11:37:17 +01:00
Greg Wilkins
5093aa3d40
Updated PushBuilder to draft for servlet 4.0
2015-10-28 17:33:38 +11:00
Mike Jensen
407ca46d94
Fix defect in DoSFilter where semaphore acquires my be leaked
...
When trying to release the semaphore in the finally block, 'asyncContext.dispatch()' may throw a "RejectedExecutionException". If this occurs, then the semaphore will never be released.
Ultimately the condition will result in all threads blocking to acquire the semaphore as the DoSFilter is continue to be used.
https://github.com/eclipse/jetty.project/pull/54
Signed-off-By: jentfoo@gmail.com
2015-10-13 08:48:45 +11:00
Mike Jensen
5b0427f9cc
Fix defect in DoSFilter where semaphore acquires my be leaked
...
When trying to release the semaphore in the finally block, 'asyncContext.dispatch()' may throw a "RejectedExecutionException". If this occurs, then the semaphore will never be released.
Ultimately the condition will result in all threads blocking to acquire the semaphore as the DoSFilter is continue to be used.
https://github.com/eclipse/jetty.project/pull/54
Signed-off-By: jentfoo@gmail.com
2015-10-13 08:46:25 +11:00
Greg Wilkins
b2f8192c7b
478923 - threads stuck at SharedBlockingCallback$Blocker.block
...
Fixed the failure path so that it also checks for non blocking callbacks
and directly calls them
2015-10-07 15:11:53 +11:00
Simone Bordet
667606ac60
Removed System.out calls.
2015-09-23 22:23:37 +02:00
Greg Wilkins
2d88fdf386
477278 Refactored DefaultServlet for cached Gzip & Etags
...
Refactored the DefaultServlet to better handle static gzipped files with etags in the cache.
Required a simplification of always having a HttpContent rather than the prior situation of
having either a Resource or a HttpContent. So introduced a HttpContent.Factory, of which
the ResourceCache is the normal implementation, but there is also now a ResourceContentFactory
that creates content when there is no cache.
The Gzip resource is now associated with the normal resource, so less lookups are needed.
This also give scope for caching dynamic gzipping in the future.
The GzipHttpContent class has been introduced to send content with the headers of the
uncompress, but content of the compressed resource.
2015-09-17 18:19:58 +10:00
Simone Bordet
2a4095590d
473955 - NPE in PushCacheFilter.
...
Fixed by normalizing to "/" the missing path of a referrer URI.
2015-07-30 19:48:38 +02:00
Simone Bordet
0753d1ce3c
Enabling PushCacheFilter only for HTTP/2.
2015-07-30 19:47:51 +02:00
Greg Wilkins
830b126e43
Fixed javadoc errors
2015-07-23 09:35:38 +10:00
Greg Wilkins
607239028c
470727 - Thread Starvation of selector wakeups.
...
Changed the CallBack.NonBlocking to a default Callback.isNonBlocking, so that wrapping callbacks can determine if they are NonBlocking or not.
2015-07-22 17:31:54 +10:00
Greg Wilkins
edc8bae556
472781 - GzipHandler isMimeTypeGzipable() bad logic
...
Added utility classes:
IncludeExclude - handles standard include exclude set
RegexSet - A set of regular expressions that have a combined compiled pattern
PathMap.PathSet - A set of standard path mappings
2015-07-17 16:28:48 +10:00
Simone Bordet
5bb942b5c1
Merged branch 'jetty-9.2.x' into 'master'.
2015-07-16 19:10:12 +02:00
Simone Bordet
dee941c365
472859 - ConcatServlet may expose protected resources.
2015-07-16 18:45:03 +02:00
Greg Wilkins
236edce34f
471604 - Extend CrossOriginFilter to provide a Timing-Allow-Origin header
...
applied from https://github.com/eclipse/jetty.project/pull/50
Also-by: David Seebacher <dseebacher@gmail.com>
2015-07-02 17:18:21 +10:00
Greg Wilkins
3e401a62e9
StringUtil.csvSplit(String)
2015-06-19 16:48:53 +10:00
Joakim Erdfelt
7c737a587b
Removing [version] sections in modules
2015-06-12 09:14:34 -07:00
Joakim Erdfelt
916efd6aa7
469860 - Add module metadata versioning to support backwards compat
...
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
Simone Bordet
3288eb392f
468313 - PushCacheFilter wrongly associates primary resources to themselves.
...
Fixed by not associating secondary resources that are the same as the
primary resource.
2015-05-26 18:03:55 +02:00
Greg Wilkins
ac7b515915
465053 Prevent gzip buffer overflow on complete
2015-05-22 10:46:40 +10:00
Greg Wilkins
8aeec6803c
465053 Prevent gzip buffer overflow on complete
2015-05-22 10:36:46 +10:00
Jan Bartel
2e9f46e5d8
457309 Add test to ensure GET and HEAD response headers same for gzip
2015-05-06 14:01:08 +10:00
Greg Wilkins
a593d8eef6
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-04-30 13:52:31 +10:00
Greg Wilkins
b5818034eb
465734 DosFilter whitelist bit pattern fix
...
removed conflicting setter
2015-04-30 13:51:27 +10:00
Jan Bartel
e30c05cc2b
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java
tests/test-integration/src/test/resources/BIOHttp.xml
tests/test-integration/src/test/resources/BIOHttps.xml
tests/test-integration/src/test/resources/NIOHttp.xml
tests/test-integration/src/test/resources/NIOHttps.xml
2015-04-30 10:44:44 +10:00
Greg Wilkins
2c65b66f9c
465734 DosFilter whitelist bit pattern fix
2015-04-29 15:18:48 +10:00
Joakim Erdfelt
6b5e45d089
Fixing test on Scanner to use real test directory, not aliased one.
2015-04-24 15:54:43 -07:00
Joakim Erdfelt
c9d8d07a63
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 14:21:53 -07:00
Greg Wilkins
eee2a53197
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-04-22 16:12:10 +10:00
Greg Wilkins
e97c726ccf
464740 DosFilter whiteList check improvement
2015-04-22 13:19:00 +10:00
Joakim Erdfelt
09b5f680b7
464727 - Update Javadoc for Java 8 DocLint
...
Eliminate empty tag warnings
+ Changed <p/> to <p>
+ Changed <br/> to <br>
2015-04-15 14:38:35 -07:00
Simone Bordet
3169e3becf
444721 - PushCacheFilter cleanup/improvements.
...
Only associating secondary resources that have been requested with a GET.
2015-04-13 17:16:26 +02:00
Simone Bordet
ffadcd6757
444721 - PushCacheFilter cleanup/improvements.
...
Ported the "maxAssociations" functionality from SPDY's ReferrerPushStrategy.
Added JMX support.
Removed __renew__ special path in favour of a JMX method.
Added clearPushCache() JMX method.
Made push reentrant by eliminating the check for "org.eclipse.jetty.pushed".
2015-04-10 15:22:49 +02:00
Greg Wilkins
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
Simone Bordet
b8623c125f
Merged branch 'jetty-9.2.x' into 'master'.
2015-03-25 11:11:49 +01:00
Simone Bordet
aa096d56c1
Fixed Javadocs.
2015-03-25 11:11:12 +01:00
Greg Wilkins
0592ecf3e9
cleaned up PushBuilder API
2015-03-11 12:06:51 +11:00
Greg Wilkins
4e1de48ba6
Simplified Gzip test
2015-02-27 13:54:41 +11:00
Greg Wilkins
1b62a30abb
460291 - AsyncGzipFilter Mappings
...
Changed AsyncGzipFilter to default check gzip file to setting from default servlet
2015-02-19 09:53:03 +11:00
Jan Bartel
c7b8707849
459125 GzipHandler default mimeType behavior incorrect
2015-02-11 11:15:55 +11:00
Greg Wilkins
14cd10b676
experimenting with push API
2015-02-06 13:48:34 +11:00
Greg Wilkins
ab8b7f8c8d
PushBuilder uses full URI
2015-02-06 10:44:19 +11:00
Greg Wilkins
9618f45ead
Merge branch 'jetty-9.2.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.2.x
2015-01-08 11:40:02 +01:00
Greg Wilkins
3fed24127f
456956 Reduce ThreadLocal.remove() weak reference garbage
2015-01-08 11:39:40 +01:00
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Greg Wilkins
3270af81e8
456956 Reduce ThreadLocal.remove() weak reference garbage
2015-01-07 19:53:30 +01:00
Greg Wilkins
dfe9dc3115
Further experimentation with PushBuilder
2014-12-09 12:27:39 +01:00
Greg Wilkins
06b1efc182
Added alternate push API and example
2014-12-05 17:47:25 +01:00
Greg Wilkins
88ddab9892
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
VERSION.txt
2014-12-04 01:33:56 +11:00
Greg Wilkins
904b6a113f
update javadoc for DoSFilter
2014-12-04 01:01:18 +11:00
Greg Wilkins
1834e360ea
Added RFC6585 status codes and use 429 for DoSFilter
2014-11-12 14:16:41 +11:00
Greg Wilkins
39360d91e6
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-11-12 13:52:32 +11:00
Greg Wilkins
e0fbd6d9f2
Increased timeout to 5s for gzip tests.
...
Writing large mp3's 1 byte with flush can be slow and 2s was not enough.
2014-11-12 13:51:31 +11:00
Greg Wilkins
dfe799d04c
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
Added Interceptor chain so that double gzip interception can be prevented.
2014-11-12 12:36:56 +11:00
Greg Wilkins
5fe992bf04
450855 GzipFilter MIGHT_COMPRESS exception
...
Re-enabled some default GzipFilter tests. These will work because the filter rewraps the response on
the dispatch. It is only the timeout test that will not work with default.
2014-11-12 10:46:14 +11:00
Greg Wilkins
85811dad9b
450873 Disable tests that downcaste wrapped GzipFilterResponses
2014-11-12 10:41:48 +11:00
Greg Wilkins
5165d4c7ad
450855 GzipFilter MIGHT_COMPRESS exception
...
Disabled tests that tried to apply the GzipFilter to default async content generation. These
tests will never work as GzipFilter wraps the response and the default async does not preserve wrappers.
For the MIGHT_COMPRESS issue, improved the filter to handle the case that it has already been applied to
a request/response and that the state is already mightCompress.
2014-11-12 10:20:06 +11:00
Joakim Erdfelt
27eccbc9b2
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncScheduledWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncTimeoutDispatchBasedWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/AsyncTimeoutWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterLayeredTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncScheduledDispatchWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncScheduledWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutCompleteWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutDispatchBasedWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutDispatchWrite.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/AsyncTimeoutWrite.java
2014-11-11 10:59:02 -07:00
Joakim Erdfelt
f04903fb68
Increasing the variety of Gzip tests per recommendations by Simone
2014-11-11 10:16:41 -07:00
Joakim Erdfelt
00692c0ff3
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java
2014-11-10 19:31:31 -07:00
Joakim Erdfelt
5941bf76d6
Removing GzipTester.assertIsResponseNotGzipCompressed
2014-11-10 18:37:58 -07:00
Joakim Erdfelt
e83df11eaf
Removing GzipTester.assertIsResponseNotGzipCompressed
2014-11-10 17:58:38 -07:00
Joakim Erdfelt
f8e431da1f
Removing GzipTester.assertIsResponseNotGzipCompressedAndEqualToExpectedString
2014-11-10 17:51:46 -07:00
Joakim Erdfelt
d9d94ec1d2
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java
jetty-servlets/src/test/resources/jetty-logging.properties
2014-11-10 16:43:56 -07:00
Joakim Erdfelt
5de887f00f
replace GzipTester.issueRequest with preexisting GzipTester.executeRequest
2014-11-10 16:04:25 -07:00
Joakim Erdfelt
006ea256b0
test names with ':' makes ms windows very unhappy
2014-11-10 12:34:24 -07:00
Joakim Erdfelt
030ff92720
Some cleanup of the Gzip tests
...
+ Seeing more edge cases that can cause problems.
Set those to @Ignore for greg to take a look at
2014-11-10 12:05:23 -07:00
Joakim Erdfelt
9e8a776c3e
450855 - GZipFilter declaration order can result in MIGHT_COMPRESS
...
+ Adding testcase GzipFilterLayeredTest to demonstrate this bug
+ Some cleanup of Gzip testing behavior to be easier to follow
(less reliance on GzipTester utility class)
2014-11-10 11:22:22 -07:00
Joakim Erdfelt
e4cc9ea5de
Updating gzip tests to include 1 other flavor
2014-11-07 11:13:37 -07:00
Greg Wilkins
8578088745
moved gzip after merge
2014-11-07 15:05:01 +11:00
Greg Wilkins
cf025b3638
fixed merge
2014-11-07 14:52:03 +11:00
Jan Bartel
8694d9265d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java
2014-11-07 14:10:47 +11:00
Greg Wilkins
0b68144a27
fixed asyncgzipfilter tests
2014-11-07 11:23:03 +11:00
Joakim Erdfelt
9223ca965c
Demonstration of Async with GZip
2014-11-06 15:11:34 -07:00
Joakim Erdfelt
c486923ad5
Minor cleanup
2014-11-06 12:33:23 -07:00
Greg Wilkins
c9c6ec8d63
449811 handle unquoted etags when gzipping
2014-11-05 11:07:14 +11:00
Greg Wilkins
d410fa57b5
449811 handle unquoted etags when gzipping
2014-11-05 11:03:10 +11:00
Greg Wilkins
67e686c108
447515 Remove GzipFilter
...
Added a module to apply GzipHandler to the entire server
2014-10-24 10:48:33 +11:00
Greg Wilkins
738c47bc55
447515 Remove GzipFilter
...
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
2014-10-24 08:17:05 +11:00
Greg Wilkins
4bbd3e9909
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-22 14:08:52 +11:00
Jan Bartel
592265c21f
447627 MultiPart file always created when "filename" set in Content-Disposition
2014-10-22 12:56:59 +11:00
Greg Wilkins
062a5c4113
447515 Remove GzipFilter
...
misc cleanups in preparation for removal
2014-10-17 15:52:11 +11:00
Greg Wilkins
aad1f9d058
447515 Remove GzipFilter
...
Made GzipHandler the same as AsyncGzipFilter
Added a HttpOutput.Interceptor
2014-10-16 20:50:11 +11:00
Greg Wilkins
ec79a6f88e
Improve HTTP header pre-encoding
...
The HttpContent class has been reworked to store HttpField instances, we may be generated on
demand or instances of PreEncodedHttpField.
The encoding of HTTP2 fields has been generalized to handle both indexed and literal fields, selected
by header enum set.
Default servlet and response classes have been cleaned up in how they set response headers.
2014-10-16 12:31:37 +11:00
Joakim Erdfelt
dec984302a
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogHandlerTest.java
2014-10-10 16:14:06 -07:00
Jan Bartel
dd864f9799
443529 CrossOriginFilter does not accept wildcard for allowedHeaders
2014-10-10 15:53:13 +11:00
Greg Wilkins
bb2d77f00b
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-10 14:20:30 +11:00
Greg Wilkins
758ce66c8d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-websocket/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
Jan Bartel
060a26ecfe
443530 CrossOriginFilter does not set the Vary header
2014-10-09 17:23:01 +11:00
Jan Bartel
34fafcce4c
442419 CrossOriginFilter javadoc says "exposeHeaders", but should be "exposedHeaders"
2014-10-09 14:10:27 +11:00
Joakim Erdfelt
eb39d75f29
Javadoc update
2014-10-08 11:02:13 -07:00
Greg Wilkins
a573430840
PushCacheFilter handles multiple hosts and ports
2014-09-22 11:10:13 +10:00
Greg Wilkins
580c87bcc6
Enhanced PushCacheFilter
...
Can learn associations from if-modified-since requests
has __renewPushCache__ special URI to renew associations HACK!
2014-09-21 15:03:54 +10:00
Simone Bordet
b74c6d1b8d
Using method superWrite() instead of super.write().
2014-09-18 15:13:50 +02:00
Greg Wilkins
0acee9851f
minor cleanups of exceptions
2014-09-18 18:23:48 +10:00
Joakim Erdfelt
2755746def
Merge branch 'jetty-http2'
2014-09-11 05:56:55 -07:00
Greg Wilkins
40d84ff1e3
443662 Consume buffer in write(ByteBuffer)
2014-09-10 17:41:14 +10:00
Greg Wilkins
ae8e7f0067
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-08-20 12:02:09 +10:00
Greg Wilkins
06cee4b08d
441897 Fixed etag handling in gzipfilter
2014-08-20 11:56:32 +10:00
Simone Bordet
75912deb52
Updated parameter name from "associateDelay" to "associatePeriod".
2014-08-15 18:07:41 +02:00
Simone Bordet
81ded3cddd
Added JMX annotations to PushCacheFilter.
2014-08-15 16:59:16 +02:00
Simone Bordet
48b1f9f3f1
Implemented HTTP/2 push functionality.
...
A PushCacheFilter contains the logic to associate secondary resources
to primary resources.
PushCacheFilter calls a Jetty-specific API on the request dispatcher:
Dispatcher.push(ServletRequest). This is a technology preview of the
push functionality slated for Servlet 4.0.
The push() invocation arrives to the transport and it is converted to
HTTP/2 specific PUSH_PROMISE, along with the mechanism to simulate
the request for the secondary resource.
2014-08-14 23:05:35 +02:00
Greg Wilkins
98b654ba20
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-distribution/pom.xml
2014-08-14 08:38:25 +10:00
Greg Wilkins
18b6a9b3d9
435533 Handle 0 sized async gzip
2014-08-14 07:48:27 +10:00
Greg Wilkins
2af613a28b
improved debugging output
2014-08-13 15:56:02 +10:00
Greg Wilkins
c7d0bfce20
basic push cache filter
2014-08-08 18:01:09 +10:00
Greg Wilkins
17f46665df
preencoded httpfield optimisation
2014-08-06 21:09:26 +10:00
Greg Wilkins
b5971484a5
Basic push mechanism skeleton
2014-08-06 10:50:55 +10:00
Greg Wilkins
b439549793
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2014-08-01 09:50:20 +10:00
Greg Wilkins
77b8077910
435322 Fix AsyncGzipFilter missing callback on empty content
2014-08-01 09:02:10 +10:00
Greg Wilkins
66980f2449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
examples/quickstart/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-dispatch-webapp/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-07-25 17:37:53 +10:00
Simone Bordet
5956b9e013
411323 - DosFilter/QoSFilter should use AsyncContext rather than Continuations.
2014-07-23 14:07:14 +02:00
Greg Wilkins
fa3d7d0f7e
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
Simone Bordet
467773dbdf
Merged branch 'master' into 'jetty-http2'.
2014-07-22 21:14:46 +02:00
Simone Bordet
b6ca7b3fa5
411323 - DosFilter/QoSFilter should use AsyncContext rather than Continuations.
2014-07-22 16:03:11 +02:00
Simone Bordet
522529a87d
Merged branch 'origin/master' into 'jetty-http2'.
2014-07-16 16:27:00 +02:00
Greg Wilkins
409389ba6e
439652 GzipHandler super.doStart
2014-07-16 16:45:02 +10:00
Greg Wilkins
f9ffefbe13
refactored to avoid copying MetaData.Request instances
2014-07-11 16:35:25 +10:00
Greg Wilkins
fff2dd2f2d
misc test fixes for rfc7230 issues
2014-07-11 16:10:06 +10:00
Greg Wilkins
5e281dd449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
Greg Wilkins
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
Jan Bartel
5969638e69
439201 GzipFilter and AsyncGzipFilter should strip charset from Content-Type before making exclusion comparison in doFilter
2014-07-09 18:01:07 +10:00
Simone Bordet
59deebeb9c
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-19 16:26:58 +02:00
Greg Wilkins
3fcb910c1a
improved HttpField.contains
2014-06-17 19:02:53 +02:00
Jan Bartel
bca7e75d9f
436916 CGI: "Search docroot for a matching execCmd" logic is wrong
2014-06-17 11:57:02 +02:00
Greg Wilkins
272e1d8da5
Refactored HttpChannel to not have direct HttpParser dependency
2014-06-17 00:02:50 +02:00
Jan Bartel
bfce68e85c
Fix typo in comment on GzipHttpOutput
2014-06-10 16:47:10 +02:00
Jan Bartel
144a460407
436894 GzipFilter code cleanup
2014-06-10 16:28:45 +02:00
Greg Wilkins
d6672a3e5f
436029 GzipFilter errors on asynchronous methods with message to AsyncGzipFilter
2014-05-28 13:01:55 +02:00
Greg Wilkins
5a0811b328
432468 Improve command CGI path handling
2014-04-11 10:48:24 +10:00
Greg Wilkins
086e39f6db
423392 Fix buffer overflow in AsyncGzipFilter
2014-04-07 12:32:46 +10:00
Greg Wilkins
352a1303e0
424899 Initialize GzipHandler mimeTypes
2014-02-17 13:04:27 +11:00
Joakim Erdfelt
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
Greg Wilkins
b91d1745ad
424498 made bytebufferendpoint threadsafe
2013-12-20 12:49:57 +11:00
Joakim Erdfelt
2b0db585ef
424183 - Start does not find LIB (Classpath) when on non-English locale
...
+ Adding more Java Environment dump to --list-config
+ Fixing .toUpperCase() use to include Locale.ENGLISH
2013-12-16 14:18:04 -07:00
Simone Bordet
8d621a9331
424043 - IteratingCallback Idle race.
...
A few renamings and fixes to avoid IllegalStateExceptions.
2013-12-15 23:51:04 +01:00
Simone Bordet
41fc2b8f87
424043 - IteratingCallback Idle race.
...
Renamed Next enum to Action, and renamed some constant of the State
enum to avoid confusion with the Action enum.
Simplified succeeded() and failed(Throwable) code,
covering also cases not covered before.
Fixed case SCHEDULED in succeeded() that was returning in case the
compareAndSet failed.
Fixed race in perform(), where 2 threads may execute concurrently
after having returned from process().
Vastly improved javadocs and comments.
2013-12-15 00:47:55 +01:00
Greg Wilkins
7141483356
424043 - IteratingCallback Idle race
2013-12-14 09:14:12 +11:00
Greg Wilkins
8243bd60b7
423392 - GzipFilter without wrapping or blocking
...
Handle the case where a gzip flush requires multiple iterations to go from finish() to finished()
Better handling of exceptional cases
2013-12-09 18:20:04 +11:00
Greg Wilkins
cd05751ff7
423392 - GzipFilter without wrapping or blocking
...
I Added AsyncGzipFilter, which uses a modified HttpOutput instance to provide gzip compression without wrapping or blocking.
Does not currently handle deflate.
2013-12-06 22:53:41 +11:00
Joakim Erdfelt
4d761edb53
Fixing missing license header
2013-12-05 13:37:35 -07:00
Greg Wilkins
e9df551352
423005 reuse gzipfilter buffers
2013-12-05 10:52:32 +11:00
Jan Bartel
a6cdac1d88
422388 Test for GzipFilter apply to resources with charset appended to the MIME type
2013-11-25 13:07:22 +11:00
Jan Bartel
17d281fa7c
422386 Comma-separated <param-value>s not trimmed in GzipFilter
2013-11-25 10:24:17 +11:00
Greg Wilkins
b888b458ac
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-11-07 17:20:39 +11:00
Greg Wilkins
f7240fee38
421197 - synchronize gzip output finish
2013-11-07 16:48:07 +11:00
Greg Wilkins
36c807c2f3
417223 - removed deprecated ThreadPool.dispatch
2013-11-04 17:21:50 +11:00
Greg Wilkins
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
Greg Wilkins
eb3bb660b5
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
Mikhail Mazursky
6b0269a16d
[Bug 420930] Use Charset to specify character encoding
...
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
Simone Bordet
591cf9badf
Deleted class org.eclipse.jetty.util.thread.Timeout, replacing its
...
usages with o.e.j.u.t.Scheduler.
2013-10-17 13:25:15 +02:00
Greg Wilkins
f3b393aa5d
Refactored complexity out of HttpFields
...
In preparation of merging Fields class and supporting HTTP/2.0 HPACK
2013-10-17 21:35:11 +11:00
Greg Wilkins
070ce9dd22
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
Mikhail Mazursky
767faece5c
[Bug 415999] Fix some of FindBugs warnings
...
Mostly not closed streams/DB resources are fixed. But also less
important things.
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Joakim Erdfelt
db19102bba
Fixing distribution - adding servlets.mod + javax.mail support
2013-09-06 07:53:35 -07:00
Jesse McConnell
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
Jesse McConnell
450cdb3ef4
add servlet/s mod
2013-08-22 12:21:52 -05:00
Joakim Erdfelt
61bda536da
Fixing malformed Javadoc warnings in jetty-servlets
2013-08-14 12:46:25 -07:00
Greg Wilkins
c27e58b785
413901 isAsyncStarted remains true while original request is dispatched
2013-08-13 10:39:26 +10:00
Joakim Erdfelt
8636c7da45
Merge branch 'master' into jetty-9.1
...
Conflicts:
jetty-maven-plugin/pom.xml
pom.xml
2013-08-05 09:53:48 -07:00
Joakim Erdfelt
74991f90d6
Cleanup from merge
2013-08-05 09:13:32 -07:00
Joakim Erdfelt
e2d872fcc7
Merge branch 'jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
pom.xml
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
2013-08-05 08:47:24 -07:00
Jan Bartel
432964cf5f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-08-05 18:03:11 +10:00
Jan Bartel
f3f2bce36c
414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF
2013-08-05 17:18:44 +10:00
Simone Bordet
89be2de57f
Merged branch 'master' into 'jetty-9.1'.
2013-07-26 19:17:30 +02:00
Jesse McConnell
7a5401e506
Merge branch 'jetty-8'
2013-07-26 10:27:43 -05:00
Jesse McConnell
5a0278fc3f
Merge branch 'jetty-7' into jetty-8
2013-07-26 10:26:46 -05:00
David Harrigan
192f2d7002
BUG-413812
...
Mark RateTracker as Serializable to allow it to be stored in a Session that is
eventually persisted in a distributed memory platform.
Signed-off-by: David Harrigan <dharrigan@gmail.com>
2013-07-26 10:24:03 -05:00
Greg Wilkins
d3ba7e9f2f
added licence headers
2013-07-19 10:41:49 +10:00
Greg Wilkins
5bfcfc908a
398467 Servlet 3.1 Non Blocking IO
...
Added the DataRateLimitedServlet as an async example
2013-07-18 15:40:24 +10:00
Greg Wilkins
965918d8f2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-04 17:28:57 +10:00
Greg Wilkins
bce8eaabe0
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
2013-07-04 17:28:22 +10:00
Greg Wilkins
89ce13c191
Merge remote-tracking branch 'origin/jetty-8'
2013-07-04 15:01:11 +10:00
Greg Wilkins
c33db24d94
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
2013-07-04 15:00:47 +10:00
Greg Wilkins
37de67d3d7
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-07-04 14:59:55 +10:00
Greg Wilkins
49f865c45a
commented out incomplete test for EOF content
2013-07-04 14:59:22 +10:00
Jan Bartel
8aac3eef48
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-07-04 11:15:39 +10:00
Jan Bartel
091a419568
411755 MultiPartInputStreamParser fails on base64 encoded content
2013-07-04 11:11:44 +10:00
Joakim Erdfelt
aa1aae182a
Instituting Content-Length OR Transfer-Encoding check in GzipFilter tests
...
+ Tests currently fail, will let greg look deeply into jetty's eyes to
determine why it defiantly doesn't want to cooperate with greg.
2013-06-30 16:37:08 -07:00
Jesse McConnell
f262dce23b
add test for gzip streaming and flushing write
2013-06-28 15:39:12 -05:00
Jesse McConnell
c089335f51
add test for gzip streaming and flushing write
2013-06-28 14:58:55 -05:00
Joakim Erdfelt
d522bb4c19
Merge branch 'jetty-8'
2013-06-28 10:21:42 -07:00
Greg Wilkins
e4716e05e1
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-06-27 09:12:28 +10:00
Jan Bartel
7ce05f2c49
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
2013-06-24 17:28:34 +10:00
Jan Bartel
a7436bc774
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2013-06-24 16:44:45 +10:00
Jan Bartel
0daddd1a3a
411458 MultiPartFilter getParameterMap doesn't preserve multivalued parameters
...
411459 MultiPartFilter.Wrapper getParameter should use charset encoding of part
2013-06-24 16:20:04 +10:00
Joakim Erdfelt
feca821522
Using try-with-resources on test
2013-06-20 06:25:51 -07:00
Greg Wilkins
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
Jan Bartel
2ea7843d86
Merge remote-tracking branch 'origin/jetty-8'
2013-06-17 14:39:17 +10:00
Jan Bartel
1908fff38f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-06-17 14:11:46 +10:00
Jesse McConnell
78cd94edb3
[Bug 396706] CGI support parameters
2013-06-14 11:24:30 -05:00
Greg Wilkins
d660cfcff6
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationBase.java
2013-06-11 11:17:04 +10:00
Thomas Becker
937c3b13b8
410098 inject accept-encoding header for all http requests through SPDY as SPDY clients MUST support spdy. Also remove two new tests that have been to implementation agnostic and not needed anymore due to recent code changes
2013-06-07 15:13:59 +02:00
Greg Wilkins
d2794584e1
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00