88945478f7
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2015-12-17 16:15:49 -07:00
1543601968
484612 - Restore WebSocket Session.close() sending 1000/Normal status code
2015-12-17 16:15:06 -07:00
9908910c3b
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2015-12-17 15:32:43 -07:00
5f27a62aae
484397 - Unavoidable NullPointerException in onMessage-Handler for PongMessages
2015-12-17 15:31:50 -07:00
3bec195d08
484440 - Swap WebSocket PathMappings for new jetty-http PathMappings
...
+ Deprecated jetty-server ServletPathSpec and RegexPathSpec
+ Moved all other code to using new jetty-http versions
2015-12-17 11:42:27 -07:00
7c5bec1b48
Using Java 8 Predicate Function
...
+ Removing jetty-util (java 7) holdover Predicate.java
+ Converting use to (java 8) java.util.function.Predicate
2015-12-17 10:15:57 -07:00
343aa066ae
Merge branch 'jetty-9.2.x' into jetty-9.3.x
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/WarPluginInfo.java
jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/Main.java
jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.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
jetty-util/src/test/java/org/eclipse/jetty/util/IncludeExcludeTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
2015-12-16 12:56:13 -07:00
e6901b2646
484349 - Promote WebSocket PathMappings / PathSpec to Jetty Http
...
+ More testing, more improvements
2015-12-16 11:06:17 -07:00
4f9d785b46
Revert "482042 - New API, Allow customization of ServletHandler path mapping"
...
This reverts commit 77d4b54082
2015-12-16 10:08:02 -07:00
abe5d090bb
[447816] - ServletHolder#compareTo not transitive
...
Updating compareTo to properly order when one _className is null and the other is not.
Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
2015-12-16 09:24:40 +11:00
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
77d4b54082
482042 - New API, Allow customization of ServletHandler path mapping
...
+ Swapping out PathMap for PathMappings in ServletHandler
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2015-12-15 14:41:37 -07:00
a52a182369
484349 - Promote WebSocket PathMappings / PathSpec to Jetty Http
...
+ Moving PathMappings from jetty-websocket to jetty-http
+ Renaming WebSocketPathSpec to UriTemplatePathSpec
+ Improving implementation with knowledge gained from PathMap
and PathMapTest cases.
2015-12-15 13:57:01 -07:00
717fc7819d
484262 - Race condition between GOAWAY disconnect and ability to make new request.
...
Fixed by making sure that when a peer received a GOAWAY frame, it
does not also notify the onFailure() callback.
2015-12-15 15:35:04 +01:00
d4d9ceea86
Improved toString().
2015-12-15 14:11:56 +01:00
bf9f39dc17
Improved exception reporting.
2015-12-14 15:00:19 +01:00
8d28be5786
484210 - HttpClient over HTTP/2 should honor maxConcurrentStreams.
...
Fixed by sending queued requests in a loop up to maxConcurrentStreams.
Also updating the maxConcurrentStreams value when received from the
server.
2015-12-11 18:00:48 +01:00
e674d3ec5e
483878 - Parallel requests stuck via the http client transport over HTTP/2.
2015-12-11 17:58:31 +01:00
77e0df1193
484167 - GOAWAY frames aren't handling disconnects appropriately on Client.
...
Improved handling of the failure case.
2015-12-11 12:34:48 +01:00
c3889873f6
484167 - GOAWAY frames aren't handling disconnects appropriately on Client.
...
Fixed by overriding onClose() to listen for GOAWAY frames, and acting
appropriately.
2015-12-11 12:25:54 +01:00
e7d8980952
Improved generate/parse tests.
2015-12-09 11:56:49 +01:00
35da4a3c54
483878 - Parallel requests stuck via the http client transport over HTTP/2.
...
Fixed by recycling correctly the blockBuffer.
2015-12-09 11:56:26 +01:00
c5e56e72e6
Added concurrent load tests.
2015-12-09 10:51:24 +01:00
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
5e3fbbccd0
Backporting GzipHandler's IncludeExclude configs
2015-12-08 15:51:25 -07:00
7cdc58e6b9
Merge branch 'jetty-9.2.x' into feature/gziphandler-config
2015-12-08 14:56:26 -07:00
e2a20e0465
Using Map interface to get around ConcurrentHashMap.keySet() bug with Java 8
...
See https://gist.github.com/AlainODea/1375759b8720a3f9f094
for details
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
2015-12-08 14:55:45 -07:00
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
8d6206b8c7
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2015-12-08 22:20:05 +01:00
1693dd135d
483857 - jetty-client onComplete isn't called in case of exception in GZIPContentDecoder.
...
Fixed by catching the exceptions and failing the callbacks.
Also using return values from HttpReceiver to compute what to
return to the parser.
2015-12-08 22:10:27 +01:00
e4a5820f15
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2015-12-08 22:05:20 +01:00
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
9c673e542d
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2015-12-08 13:02:20 +01:00
e6f23a692e
482270 - Expose upgrade request locales.
...
Exposed as a user property.
2015-12-08 12:04:22 +01:00
b9c1535552
481567 - permessage-deflate causing data-dependent ju.zip.DataFormatException: invalid stored block lengths
...
+ Reworked PerMessageDeflateExtensionTest to test with different
modes (http/ws vs https/wss), different messages sizes, and
input buffer sizes (these various configurations do trigger
the reported bug)
+ Made CompressExtension loop over the input buffer if the buffer
happens to not be entirely consumed.
2015-12-07 13:15:29 -07:00
66e596511d
483620 Servlet annotation mapping to "/" should override webdefault.xml mapping
2015-12-04 15:58:07 +11:00
bae1138211
Fixing test expectations on Decorator counts
2015-12-02 12:19:52 -07:00
c83bf80702
Merge branch 'feature/deprecationwarning' into jetty-9.3.x
2015-12-02 11:38:30 -07:00
1bd0602c9f
483413 - Warn on @Deprecated servlet/filter use
2015-12-02 12:57:54 +11:00
6978eeb5c4
483422 - Empty chunked body in 304 Response
...
test harness only
2015-12-02 12:41:51 +11:00
45350b62c1
483344 - text/csv Mime Type For CSV in mime properties File
2015-12-02 11:11:39 +11:00
6d3d912b0b
483413 - Warn on @Deprecated servlet/filter use
2015-12-01 16:18:00 -07:00
481102db30
483413 - Warn on @Deprecated servlet/filter use
2015-12-01 15:53:46 -07:00
fe84c34bde
Fixing Javadoc for Java 8 based builds
2015-11-30 11:28:16 -07:00
ee9c57e3ea
482670 - HttpURI wrongly parser URI paths starting with /@
2015-11-26 11:39:55 +11:00
a2c057892e
483039 - HTTP2 Upgrade case sensitivity on Connection header
2015-11-26 07:06:38 +11:00
d2e4eff686
Made test behave the same for different proxy servlets to reduce
...
instanceof checks.
2015-11-25 17:21:51 +01:00
a686e26c31
Removed debug leftovers.
2015-11-25 16:03:41 +01:00
eac966cb9b
483009 - MultiPartContentProvider may send wrong Content-Length.
...
Introduced method close() to signal when no more parts will be added,
and calculating the Content-Length in setListener() only if when closed.
2015-11-25 16:02:21 +01:00
3c54806d47
482959 - Local stream count never decrements when closing a stream causing IllegalStateException.
...
This issue was caused by removeStream(IStream, boolean) to take a
boolean parameter that indicated whether the close of the stream was
caused by a sent frame (local) or by a received frame (remote).
However, this was wrong, since a local stream may be closed by
receiving a frame. This error was causing the local and remote stream
counts held by HTTP2Session to be decremented wrongly, causing the
IllegalStateException mentioned in the bug report.
Fixed by decrementing the stream counters based on whether the stream
itself is local or remote.
2015-11-25 12:58:02 +01:00
Joakim Erdfelt
Matt Gilman
Simone Bordet
Greg Wilkins
Jan Bartel