11656 Commits

Author SHA1 Message Date
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
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
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
Simone Bordet
9aa6dc1e7d Merged branch 'jetty-9.3.x' into 'master'. 2015-12-08 13:02:55 +01:00
Simone Bordet
9c673e542d Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-12-08 13:02:20 +01:00
Simone Bordet
e6f23a692e 482270 - Expose upgrade request locales.
Exposed as a user property.
2015-12-08 12:04:22 +01:00
Joakim Erdfelt
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
Jan Bartel
66e596511d 483620 Servlet annotation mapping to "/" should override webdefault.xml mapping 2015-12-04 15:58:07 +11:00
Greg Wilkins
ae9dc7922d 483427 - AsyncContext complete while pending async Reads/Writes
improved unit test
2015-12-04 10:10:12 +11:00
Greg Wilkins
5afa348aaa removed debug 2015-12-03 17:27:43 +11:00
Greg Wilkins
384caf02c1 483427 - AsyncContext complete while pending async Reads/Writes 2015-12-03 14:20:09 +11:00
Joakim Erdfelt
3e3fd07c96 fixing imports 2015-12-02 13:04:40 -07:00
Joakim Erdfelt
97722aeea8 Merge branch 'jetty-9.3.x' 2015-12-02 12:20:06 -07:00
Joakim Erdfelt
bae1138211 Fixing test expectations on Decorator counts 2015-12-02 12:19:52 -07: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
Joakim Erdfelt
c83bf80702 Merge branch 'feature/deprecationwarning' into jetty-9.3.x 2015-12-02 11:38:30 -07:00
Greg Wilkins
ddba6c20cd 483427 - AsyncContext complete while pending async Reads/Writes 2015-12-02 16:46:20 +11:00
Greg Wilkins
4bbd060ca8 483427 - AsyncContext complete while pending async Reads/Writes 2015-12-02 16:07:59 +11:00
Greg Wilkins
1bd0602c9f 483413 - Warn on @Deprecated servlet/filter use 2015-12-02 12:57:54 +11:00
Greg Wilkins
6978eeb5c4 483422 - Empty chunked body in 304 Response
test harness only
2015-12-02 12:41:51 +11:00
Greg Wilkins
5e40bf29aa Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-12-02 11:16:17 +11:00
Greg Wilkins
45350b62c1 483344 - text/csv Mime Type For CSV in mime properties File 2015-12-02 11:11:39 +11:00
Joakim Erdfelt
6d3d912b0b 483413 - Warn on @Deprecated servlet/filter use 2015-12-01 16:18:00 -07:00
Joakim Erdfelt
481102db30 483413 - Warn on @Deprecated servlet/filter use 2015-12-01 15:53:46 -07:00
Joakim Erdfelt
480972e340 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2015-12-01 07:46:09 -07:00
Joakim Erdfelt
040b2c9b31 More Javadoc fixes 2015-11-30 11:53:57 -07:00
Joakim Erdfelt
3357162cc6 Merge branch 'jetty-9.3.x'
Conflicts:
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
	jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java
2015-11-30 11:31:58 -07:00
Joakim Erdfelt
fe84c34bde Fixing Javadoc for Java 8 based builds 2015-11-30 11:28:16 -07:00