Commit Graph

10398 Commits

Author SHA1 Message Date
Joakim Erdfelt c52f100ec3 Making WebSocket use new Upgrade mechanism
+ Also fixes websocket server prefill bytes issue
+ Adjusting client side to also use/benefit from new Upgrade mechanism
2015-02-13 15:16:48 -07:00
Simone Bordet 5a40ed5a0d Fixed test, and added test to check close state of pushed streams. 2015-02-13 18:08:39 +01:00
Simone Bordet ff7e0e626a Implemented notification of session failure events. 2015-02-13 14:18:08 +01:00
Simone Bordet 9677988960 Removed TODO. 2015-02-13 13:11:59 +01:00
Greg Wilkins a2e051c4e0 made StreamResetTest test less of a race 2015-02-13 16:15:08 +11:00
Greg Wilkins c090f179a7 459845 - Support upgrade from http1 to http2/websocket
Added jetty-http2c.xml and http2c.mod
2015-02-13 15:06:24 +11:00
Greg Wilkins 4db654ad32 Organised http2 imports 2015-02-13 13:43:32 +11:00
Greg Wilkins 98e3a28794 459845 - Support upgrade from http1 to http2/websocket
Added test harness for h2c upgrade.
2015-02-13 13:41:14 +11:00
Greg Wilkins c3332e7d2e 459845 - Support upgrade from http1 to http2/websocket
Added support for unofficial "upgrade" from http/1 to h2c
2015-02-13 12:16:03 +11:00
Greg Wilkins 0f7ee8d607 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpVersion.java
	jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2015-02-13 11:45:56 +11:00
Greg Wilkins 2b2a70a93a 459845 Support upgrade
Added the concept of UpgradeFrom and UpgradeTo connections that support
transferring a buffer with content before opening new connection.
Aded EndPoint.update method as utility
2015-02-13 11:41:18 +11:00
Simone Bordet 1f90d62d3f Merged branch 'jetty-9.2.x' into 'master'. 2015-02-12 23:11:05 +01:00
Simone Bordet d788df9a57 Added serverResponse parameter to filterServerResponseHeader(). 2015-02-12 23:10:37 +01:00
Joakim Erdfelt 7811c10727 Fixing http2-client test quirk when 2015-02-12 14:42:02 -07:00
Simone Bordet 0677735550 Simplified HTTP/2 parser and its listener.
It is not possible to perform asynchronous processing of the content
of DATA frames, because otherwise the parser has to stop, stalling
all other streams.
Parser.Listener methods were returning boolean in a vestigial attempt
to handle asynchronous data processing, and have now been converted to
return void.
2015-02-12 19:43:52 +01:00
Joakim Erdfelt f7b9206b2e Eliminating final protonego references 2015-02-12 10:14:01 -07:00
Joakim Erdfelt 30dda86b20 Merge branch 'jetty-9.2.x' 2015-02-12 09:59:52 -07:00
Joakim Erdfelt 23e9246115 Adding TooFastClientTest for websocket server
+ test performs a client upgrade + 2 websocket frames all at once.
  not waiting for the upgrade response before sending those frames.
+ currently set to @Ignore until we can address how to copy this extra
  buffer information from the Http side to the WebSocket side.
2015-02-12 09:30:31 -07:00
Joakim Erdfelt 12ca82b5bd Updating protonego ref 2015-02-12 09:09:17 -07:00
Simone Bordet 38b5c11d25 Fixed merge conflict. 2015-02-12 14:40:43 +01:00
Simone Bordet 465f6f7da8 Merged branch 'jetty-9.2.x' into 'master'. 2015-02-12 14:32:24 +01:00
Simone Bordet 968ed9f0ae Small updates to ProxyServletTest. 2015-02-12 14:27:09 +01:00
Simone Bordet c449f1fa20 459769 - AsyncMiddleManServlet race condition on last download content.
Fixed by coordinating the notification of the proxying termination
between the last write performed from onSuccess() and the onComplete()
event using a CountingCallback.
2015-02-12 14:20:09 +01:00
Simone Bordet 2cd26725e1 Fixed bug in onSuccess() where the count was decreased to zero on the
first call to succeeded() due to not returning after the
successful compareAndSet().
2015-02-12 14:20:09 +01:00
Greg Wilkins a147cee480 459731 - Update for drafts hpack-11 and http2-17 2015-02-12 14:45:12 +11:00
Jan Bartel e21d078d2b Update date on osgi bundle copyright message. 2015-02-12 10:33:20 +11:00
Jan Bartel b45389ad87 Fix http2 osgi manifests and tests 2015-02-12 10:32:16 +11:00
Joakim Erdfelt 20fa13605c 459655 - Remove SPDY and NPN
+ Flattening protonego-* to alpn.mod + alpn-impl/alpn-${java.version}
2015-02-11 10:58:10 -07:00
Joakim Erdfelt cab76950e1 459655 - Remove SPDY and NPN
+ Removed src/test/resources/usecases/home
+ Updated src/test/resources/dist-home to represent current distribution
  configuration for Jetty 9.3.0 without SPDY or NPN
+ Changed all test cases to use new dist-home
+ Refactored TestUseCases and TestBaseUseCases for @Parameterized and
  consistent naming in src/test/resources/usecases/
2015-02-11 10:05:51 -07:00
Simone Bordet 360b72a29e HTTP/2 API Javadocs. 2015-02-11 17:44:05 +01:00
Simone Bordet 8ca0a86352 459655 - Remove SPDY and NPN.
Cleanup of javadocs, comments, XML and other text files.
2015-02-11 16:21:53 +01:00
Simone Bordet be860741d5 459655 - Remove SPDY and NPN.
Cleanup of javadocs, comments, XML and other text files.
2015-02-11 16:18:07 +01:00
Greg Wilkins e19ed33341 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java
2015-02-11 15:08:56 +11:00
Greg Wilkins 5724b48c8d 459560 jetty.sh handles start.d and no start.ini
Also-by: Mike Dillon <mike@embody.org>
Signed-off-by: Greg Wilkins <gregw@intalio.org>
2015-02-11 14:43:35 +11:00
Greg Wilkins ca8015828c 458663 Handle null header values 2015-02-11 14:30:26 +11:00
Greg Wilkins 2162455b72 Removed SPDY and NPN
Because jetty 9.3 is targetted for HTTP2, we have removed support for SPDY and NPN.
2015-02-11 14:20:06 +11:00
Jan Bartel cf0d191c0a 459490 Defining a duplicate error page in webdefault.xml and web.xml results in an error 2015-02-11 12:20:01 +11:00
Jan Bartel c7b8707849 459125 GzipHandler default mimeType behavior incorrect 2015-02-11 11:15:55 +11:00
Jesse McConnell a187608013 update the notice.txt file to reflect updated ip info 2015-02-10 16:25:00 -06:00
Simone Bordet b399649a1a Merged branch 'jetty-9.2.x' into 'master'. 2015-02-10 15:30:20 +01:00
Simone Bordet 4462e6a01e 459352 - AsyncMiddleManServlet should set "Host:" header correctly in proxy to remote request headers.
Fixed by removing the host header during the copy, so that HttpClient
correctly sets it by looking at the request target.
2015-02-10 15:29:44 +01:00
Simone Bordet 44d262c65a Renamed GatheringCallback to CountingCallback. 2015-02-10 13:16:41 +01:00
Simone Bordet 7dffe4f082 459542 - AsyncMiddleManServlet race condition on first download content.
Fixed the race condition by submitting a zero length buffer to write
from onWritePossible() which will succeed the callback without
causing races.
2015-02-10 13:16:41 +01:00
Simone Bordet 12e2f9e6c8 459542 - AsyncMiddleManServlet race condition on first download content.
Fixed the race condition by submitting a zero length buffer to write
from onWritePossible() which will succeed the callback without
causing races.
2015-02-10 13:10:57 +01:00
Joakim Erdfelt 7f0a073b54 Merge branch 'jetty-9.2.x' 2015-02-09 14:50:34 -07:00
Joakim Erdfelt 7b00f6857f Print full RUN_CMD when jetty.sh -d is called
Also-by: Mike Dillon <mike@embody.org>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2015-02-09 14:22:40 -07:00
Simone Bordet cb5541b58e Merged branch 'jetty-9.2.x' into 'master'. 2015-02-09 17:39:16 +01:00
Simone Bordet 273854835f Made HttpClientTransportOverHTTP2 a ContainerLifeCycle, so that it
can manage the start/stop of HTTP2Client.
2015-02-09 17:33:10 +01:00
Simone Bordet 53813d94a9 Reduced logging level in test configuration. 2015-02-09 17:00:48 +01:00
Simone Bordet 3855024bba Added tests for HTTP2Client idle timeout. 2015-02-09 16:53:22 +01:00