Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 00:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,852 Commits 55 Branches 466 Tags
Commit Graph

11852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Erdfelt
9908910c3b Merge branch 'jetty-9.2.x' into jetty-9.3.x 2015-12-17 15:32:43 -07:00
Joakim Erdfelt
5f27a62aae 484397 - Unavoidable NullPointerException in onMessage-Handler for PongMessages 2015-12-17 15:31:50 -07:00
Joakim Erdfelt
a4cf7d654b 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

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-17 14:38:55 -07:00
Joakim Erdfelt
31cd3fee84 Merge branch 'jetty-9.3.x' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/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-17 12:51:57 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
e6901b2646 484349 - Promote WebSocket PathMappings / PathSpec to Jetty Http 
+ More testing, more improvements
 2015-12-16 11:06:17 -07:00
Joakim Erdfelt
4f9d785b46 Revert "482042 - New API, Allow customization of ServletHandler path mapping" 
This reverts commit 77d4b54082f6789168ea7ef1523e8e1b924bb560.
 2015-12-16 10:08:02 -07:00
Jan Bartel
68f27bbb40 Ensure SessionData attributes are cast to ConcurrentHashMap on deserialization. 2015-12-16 12:16:05 +11:00
Greg Wilkins
96e4d720df Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-12-16 09:25:20 +11:00
Matt Gilman
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
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
Greg Wilkins
50899ab212 Merge branch 'master' of git://github.com/mcgilman/jetty.project 2015-12-16 09:18:01 +11:00
Jan Bartel
fe5cc7a336 Merge branch 'master' into session-refactor 2015-12-16 09:04:30 +11:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Simone Bordet
ca6eaafdbf Merged branch 'jetty-9.3.x' into 'master'. 2015-12-15 15:42:36 +01:00
Simone Bordet
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
Simone Bordet
d4d9ceea86 Improved toString(). 2015-12-15 14:11:56 +01:00
Joakim Erdfelt
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
Matt Gilman
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Simone Bordet
4ce3882ae2 Merged branch 'jetty-9.3.x' into 'master'. 2015-12-14 15:02:04 +01:00
Simone Bordet
bf9f39dc17 Improved exception reporting. 2015-12-14 15:00:19 +01:00
Simone Bordet
829bdd3d7c Merged branch 'jetty-9.3.x' into 'master'. 2015-12-11 21:39:03 +01:00
Simone Bordet
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
Simone Bordet
e674d3ec5e 483878 - Parallel requests stuck via the http client transport over HTTP/2. 2015-12-11 17:58:31 +01:00
Simone Bordet
1bba40a549 Merged branch 'jetty-9.3.x' into 'master'. 2015-12-11 12:35:15 +01:00
Simone Bordet
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
Simone Bordet
8542715665 Merged branch 'jetty-9.3.x' into 'master'. 2015-12-11 12:26:47 +01:00
Simone Bordet
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
Jan Bartel
b1707ef228 Ensure session loading runs in scope of context classloader. 2015-12-11 16:04:39 +11:00
Jan Bartel
31ea1704a1 Make calling passivate/active depend on type of session data store; fix tests 2015-12-11 11:42:29 +11:00
Jan Bartel
4793be634f Merge branch 'master' into session-refactor 2015-12-10 09:38:58 +11:00
Simone Bordet
fc4aacc38a Merged branch 'jetty-9.3.x' into 'master'. 2015-12-09 11:57:38 +01:00
Simone Bordet
e7d8980952 Improved generate/parse tests. 2015-12-09 11:56:49 +01:00
Simone Bordet
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
Simone Bordet
c5e56e72e6 Added concurrent load tests. 2015-12-09 10:51:24 +01: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
Joakim Erdfelt
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
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
4ea1bb0233 Merged branch 'jetty-9.3.x' into 'master'. 2015-12-08 22:20:28 +01:00
Simone Bordet
8d6206b8c7 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-12-08 22:20:05 +01:00
Simone Bordet
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
Simone Bordet
a0c00236f3 Merged branch 'jetty-9.3.x' into 'master'. 2015-12-08 22:05:47 +01:00
Simone Bordet
e4a5820f15 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-12-08 22:05:20 +01:00