Commit Graph

670 Commits

Author SHA1 Message Date
Greg Wilkins cfabbd2341 minor cleanups 2017-03-30 16:04:57 +11:00
Greg Wilkins 11ba4bc849 Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk 2017-03-30 13:48:09 +11:00
Greg Wilkins 1a0b2dfdb5 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-30 13:47:47 +11:00
John Gardiner Myers 9496cef9b2 Allow for easier subclassing of the HttpChannelOverHTTP2. (#1421)
Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com>
2017-03-30 12:17:52 +11:00
Greg Wilkins 7a87c8ec9d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ewyk 2017-03-23 10:27:14 +11:00
Joakim Erdfelt 1360b863dc Updating to version 9.4.4-SNAPSHOT 2017-03-17 10:53:54 -07:00
Joakim Erdfelt 95e94b49d8 Updating to version 9.4.3.v20170317 2017-03-17 09:54:58 -07:00
Joakim Erdfelt a6a0ab991f Updating to version 9.3.18-SNAPSHOT 2017-03-17 09:48:19 -07:00
Joakim Erdfelt 307d23975e Updating to version 9.3.17.v20170317 2017-03-17 09:07:39 -07:00
Greg Wilkins c1d92ebde6 Fixed push 2017-03-17 13:41:45 +11:00
Greg Wilkins d2d6bc3e65 minor cleanups 2017-03-17 12:18:03 +11:00
Greg Wilkins d52a09a6cd work in progress 2017-03-16 18:03:16 +11:00
Greg Wilkins 9ccf0a5337 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-09 16:39:30 +11:00
Greg Wilkins 2219863c11 Issue #1340 Consistent optional use of query string in PushCacheFilter 2017-03-09 16:24:31 +11:00
Greg Wilkins 0a2da4822d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-06 14:20:23 +11:00
Simone Bordet affeb67f1a Issue #1375 - Support pushed resources in HTTP client.
Implemented in the non-API HttpRequest class.
2017-03-05 19:01:08 +01:00
Joakim Erdfelt 523fab30bd Updating to version 9.4.3-SNAPSHOT 2017-02-20 08:13:31 -07:00
Joakim Erdfelt 4a674b9cc9 Updating to version 9.4.2.v20170220 2017-02-20 06:22:45 -07:00
Simone Bordet 7923032582 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-02-02 00:24:51 +01:00
Greg Wilkins 461c6082ae Issue #1296 - Introduce HTTP parser "content complete" event. 2017-02-01 23:54:36 +01:00
Simone Bordet 7e7459d825 Fixes #612 - Support HTTP Trailer.
Implemented support in the generic HttpChannel and Request classes.
Linked HTTP/1.1 and HTTP/2 trailers to call HttpChannel, so that trailers
are now available in Servlet APIs by casting to Jetty's Request class.
The semantic is that trailers will only be available _after_ reading
the request content.
2017-01-30 15:17:59 +01:00
Jan Bartel 0b45f377bf Issue #1290 2017-01-27 15:42:52 +11:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Simone Bordet 4e0800fa5a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-19 15:22:16 +01:00
Simone Bordet 4565c186d7 Fixes #1277 - http2 alpn test error. 2017-01-19 15:18:55 +01:00
Simone Bordet 6ab0e71b38 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-18 10:42:23 +01:00
Simone Bordet 732277c002 Converted IOException to EofException in case of client close or reset.
It's common for a client to either close the connection or reset a
stream, so EofException is a better exception to report since it will
be logged at DEBUG level by the server, reducing the noise in the logs.
2017-01-18 10:41:01 +01:00
Simone Bordet f8e3b1f9c2 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-17 11:38:45 +01:00
Simone Bordet 9e9ee03d7f Issue #1073 - JDK9 support in Jetty 9.3.x.
Fixed dependencies for modules that run tests that require ALPN.
2017-01-17 11:32:20 +01:00
Simone Bordet f0b9f1c557 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-13 19:06:07 +01:00
Simone Bordet a9fb678fe2 Issue #1073 - JDK9 support in Jetty 9.3.x.
Marked tests in module http2-alpn-tests for JDK 8 only, since
equivalent tests for JDK 9 would require use of JDK 9 only APIs.
2017-01-13 19:02:28 +01:00
Simone Bordet e539d0b1fd Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-12 17:52:45 +01:00
Simone Bordet 11d669092a Issue #1073 - JDK9 support in Jetty 9.3.x.
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
Greg Wilkins df0f645aa4 fix #1248 2017-01-12 11:29:56 +11:00
Simone Bordet 95c7e78eaf Issue #1220 - PushCacheFilter does not add the context path to pushed resources.
Now taking into account the context path to cache and push resources.
2017-01-05 16:32:41 +01:00
Simone Bordet c018eb5b92 Issue #1209 - IllegalStateException when HTTP/2 push is disabled.
Skipping filter logic when HTTP/2 push is disabled.
2016-12-31 12:19:46 +01:00
Simone Bordet a35cf71e93 Improved logging. 2016-12-30 22:01:23 +01:00
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Simone Bordet dd3a73e57a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-14 11:19:49 +01:00
Simone Bordet 98fad34ca0 Fixes #1167 - NPE while completing a reset HTTP/2 stream. 2016-12-14 11:09:10 +01:00
Simone Bordet 07c9bc5a51 Fixes #1169 - HTTP/2 reset on a stalled write does not unblock writer thread.
The fix notifies the transport when a reset frame is received,
allowing the transport to fail the write callback which then notifies
the application, either by throwing (in case of blocking writes) or
by calling error listeners.

Also added a guard, in HttpChannel.handle() for the ERROR_DISPATCH case,
that checks if the response is already committed, and if so, abort
the transport - similar to what's already there for 9.4.
2016-12-14 11:07:00 +01:00
Simone Bordet 3a3978f86b Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-13 10:16:36 +01:00