Commit Graph

315 Commits

Author SHA1 Message Date
Joakim Erdfelt 7fb371a7ad Fixing testcase failure on blocking read/write during WebSocketClient use 2011-11-15 14:47:42 -07:00
Greg Wilkins a62061944e removed EndPoint.isBufferingInput 2011-11-11 11:41:29 +11:00
Greg Wilkins 921b285235 Avoid flush if no content to flush 2011-11-10 14:45:28 +11:00
Greg Wilkins 7a9b8f1e9d reverted last changes due to instability 2011-11-10 12:11:58 +11:00
Greg Wilkins d61258ec4e clean ups from review from sbordet.
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
Greg Wilkins 29fa330a6e 363124 improved websocket close handling 2011-11-09 07:09:13 +11:00
Greg Wilkins 21e692aee6 363124 improved websocket close handling 2011-11-08 18:18:34 +11:00
Greg Wilkins 7a082280f1 Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
	jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http/src/main/java/org/eclipse/jetty/http/ssl/SslContextFactory.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-11-07 18:09:31 +11:00
Joakim Erdfelt 2cff05c531 Bug 362853 - Promoting all Websocket STRICT blocks to standard behavior
+ Removing BRUTAL flag, and promoting its logic to standard behavior.
2011-11-04 11:27:50 -07:00
Joakim Erdfelt 373a2946be Bug 362853 - Promoting all Websocket STRICT blocks to standard behavior 2011-11-04 09:40:32 -07:00
Joakim Erdfelt 5ca9dbb7d4 Undoing recent change as redundant, existing STRICT block does the same thing 2011-11-03 16:03:46 -07:00
Joakim Erdfelt de4253b5e6 Bug 362850 - Websocket allowing >125 octets on control frame payloads 2011-11-03 15:47:12 -07:00
Joakim Erdfelt e2f15522bd Fixing junit test cases affected by close status code changes 2011-11-03 09:18:31 -07:00
Joakim Erdfelt c1d681551b Bug 362740 - Websocket D13 close handling is off [autobahn]
+ Address autobahn 0.4.3 test cases 7.9.*
  Description: Send close with invalid close code (999. 1004, 1005, 1006, 1011, 1100, 2000, 2999, 5000, 65535)
  Expectation: Clean close with protocol error code
2011-11-02 20:04:03 -07:00
Joakim Erdfelt da60996ce5 Bug 362740 - Websocket D13 close handling is off [autobahn]
+ Address autobahn 0.4.3 test case 7.5.1
  Description: Send a close frame with invalid UTF8 payload
  Expectation: Clean close with protocol error or invalid utf8 code
2011-11-02 17:22:40 -07:00
Joakim Erdfelt 4314c55c77 Bug 362740 - Websocket D13 close handling is off [autobahn]
+ Address autobahn 0.4.3 test case 7.3.2
  Description: Send a close frame with payload length 1
  Expectation: Clean close with protocol error
2011-11-02 16:58:29 -07:00
Joakim Erdfelt cafbb47a2f Bug 362740 - Websocket D13 close handling is off [autobahn]
+ Address autobahn 0.4.3 test case 7.3.1
  Description: Send a close frame with payload length 0 (no close code, no close reason)
  Expectation: Clean close with normal code
2011-11-02 16:47:48 -07:00
Joakim Erdfelt 903c5dcbbf Bug 362223 - Websocket client fails to send query parameters 2011-10-27 10:37:54 -07:00
Greg Wilkins 738cbfdccc refactored client to use upgradeable endpoint. Instert SslConnection when needed 2011-10-27 16:37:07 +11:00
Greg Wilkins 61664d3c0f Added concept of SslConnection 2011-10-26 01:15:59 +11:00
Jesse McConnell 1d86da8f68 [maven-release-plugin] prepare for next development iteration 2011-10-24 14:52:54 -05:00
Jesse McConnell 5f349ecc92 [maven-release-plugin] prepare release jetty-7.5.4.v20111024 2011-10-24 14:52:48 -05:00
Greg Wilkins 5140a95144 refactored HttpConnection name 2011-10-20 15:12:19 +11:00
Greg Wilkins 0e284f78f5 Protected HttpParser from multiple entry. 2011-10-20 12:18:10 +11:00
Greg Wilkins 49f8b0de1a Websocket partially refactored and passing tests 2011-10-18 21:59:49 +11:00
Greg Wilkins 6edb7c1930 organised imports 2011-10-18 15:05:22 +11:00
Greg Wilkins e43b718fb1 Refactored NIO to better handle half closes. Applied the following policy:
Call shutdownOutput to signal the other end that you have written all the data that your are going to write (eg and the end of a non persistent HTTP response).   This can be done either by generator (when it is complete) or coordinator or handle - but we need to decide which and have only 1 doing it.
    Call shutdownInput to signal your own end that you have read -1 and to allow other local code to check that with an isInputShutdown. Ideally we could get by without any calls at all to shutdownInput, so long as we well handle reading -1 (Currently we don't).  This should be done by whatever does the IO read.
    Calling close should always be a real TCP close, even with SSL. SSL shutdown
    The default handling of an idle callback should be close.  But some connections (NOT endpoints) may implement idle as initiating a shutdown exchange (eg websocket close).   If they do, this is state that should be held in the connection or parser - ie do-this-exhange-and-then-shutdown
    Call close when you want to shutdown Output and you have already read -1, so input is already shutdown.   We need to double verify that this is correct and that if a FIN has been received from the other end, that a close will not result in a reset.  I'll do that today.
    Call close when you want to shutdown Input and output has already been shutdown.  This means you have read -1 after having sent a FIN.
    Call close on any errors.

The current state is that server HttpConnection appears to be working well.  Other connection types have not been updated and/or tested
2011-10-18 14:38:02 +11:00
Jesse McConnell 7d10182034 [maven-release-plugin] prepare for next development iteration 2011-10-11 08:47:07 -05:00
Jesse McConnell b6ac542604 [maven-release-plugin] prepare release jetty-7.5.3.v20111011 2011-10-11 08:47:00 -05:00
Jesse McConnell 0c55c774d4 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:25:38 -05:00
Jesse McConnell 4d822759de [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 17:25:32 -05:00
Jesse McConnell b58006b4a4 [maven-release-plugin] prepare for next development iteration 2011-10-06 09:43:37 -05:00
Jesse McConnell 7eca345e8d [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 09:43:31 -05:00
Greg Wilkins c438d7c043 improved websocket testserver example to include ping/pong 2011-10-03 18:03:57 +11:00
Greg Wilkins fbb4893352 improved websocket testserver example to include ping/pong 2011-10-03 18:03:42 +11:00
Greg Wilkins 7bf5f7792b 359673 updated websocket version handling 2011-10-03 16:04:37 +11:00
Greg Wilkins 18aa8fed9b 359673 updated websocket version handling 2011-10-03 16:04:13 +11:00
Greg Wilkins a6988108c3 minor cleanups and extra debug 2011-09-16 15:29:28 +10:00
Greg Wilkins 54961fca1f refined test options and output 2011-09-14 14:17:09 +10:00
Greg Wilkins 55d229e73c 357338 remove debug 2011-09-13 00:38:08 +10:00
Greg Wilkins c5e6378b84 357338 Improve UTF-8 validation 2011-09-12 13:14:09 +10:00
Greg Wilkins 4c885ca3ad 357178 websockets draft 14 support 2011-09-09 12:10:01 +10:00
Jesse McConnell ebdb89dc23 [maven-release-plugin] prepare for next development iteration 2011-09-08 12:00:16 -05:00
Jesse McConnell 932245a114 [maven-release-plugin] prepare release jetty-7.5.1.v20110908 2011-09-08 12:00:10 -05:00
Jesse McConnell 37d0f53b0a updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT 2011-09-08 11:40:37 -05:00
Jesse McConnell 4a575d4958 Merge branch 'master' into release 2011-09-08 11:36:48 -05:00
Greg Wilkins e914e0f97f improved websocket handling of error cases for autobahn test suite 2011-09-09 01:52:27 +10:00
Greg Wilkins b8556bec76 fixes from running autobahn test suite 2011-09-08 11:35:39 +10:00
Jesse McConnell 6b614a54f0 [maven-release-plugin] prepare for next development iteration 2011-09-07 18:12:16 -05:00
Jesse McConnell ce55c8c601 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 18:12:09 -05:00