fe5cc7a336
Merge branch 'master' into session-refactor
2015-12-16 09:04:30 +11: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
ca6eaafdbf
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-15 15:42:36 +01: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
b6df9508c6
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
2015-12-14 14:58:12 -07:00
e8b3b68e90
[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-14 15:03:31 -05:00
1df5a05ee1
482042 - New API, Allow customization of ServletHandler path mapping
...
+ Swapping out PathMap for PathMappings in ServletHandler
2015-12-14 11:22:24 -07:00
dddba5b004
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-14 11:17:31 -07:00
4ce3882ae2
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-14 15:02:04 +01:00
bf9f39dc17
Improved exception reporting.
2015-12-14 15:00:19 +01:00
829bdd3d7c
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-11 21:39:03 +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
1bba40a549
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-11 12:35:15 +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
8542715665
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-11 12:26:47 +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
b1707ef228
Ensure session loading runs in scope of context classloader.
2015-12-11 16:04:39 +11:00
31ea1704a1
Make calling passivate/active depend on type of session data store; fix tests
2015-12-11 11:42:29 +11:00
4793be634f
Merge branch 'master' into session-refactor
2015-12-10 09:38:58 +11:00
fc4aacc38a
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-09 11:57:38 +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
4ea1bb0233
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-08 22:20:28 +01: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
a0c00236f3
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-08 22:05:47 +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
9aa6dc1e7d
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-08 13:02:55 +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
ae9dc7922d
483427 - AsyncContext complete while pending async Reads/Writes
...
improved unit test
2015-12-04 10:10:12 +11:00
5afa348aaa
removed debug
2015-12-03 17:27:43 +11:00
b0b03cfa45
Merge branch 'master' into session-refactor
2015-12-03 16:59:28 +11:00
9ff55cb301
Merge branch 'master' into session-refactor
...
Conflicts:
jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionManager.java
jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java
tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java
tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractInvalidationSessionTest.java
2015-12-03 16:57:51 +11:00
384caf02c1
483427 - AsyncContext complete while pending async Reads/Writes
2015-12-03 14:20:09 +11:00
3e3fd07c96
fixing imports
2015-12-02 13:04:40 -07:00
97722aeea8
Merge branch 'jetty-9.3.x'
2015-12-02 12:20:06 -07:00
bae1138211
Fixing test expectations on Decorator counts
2015-12-02 12:19:52 -07:00
Jan Bartel
Joakim Erdfelt
Simone Bordet
Matt Gilman
Greg Wilkins