Commit Graph

2799 Commits

Author SHA1 Message Date
Greg Wilkins 144195d435 removed redundant setConnection 2011-11-10 12:47:50 +11:00
Greg Wilkins 7504d24e9e Fixed SslConnection upgrade handling 2011-11-10 12:44:32 +11:00
Greg Wilkins 6e14902659 AsyncEndPoint is-a ConnectedEndPoint 2011-11-10 12:44:03 +11:00
Greg Wilkins e3cf7a8898 improved ThreadDeath handling 2011-11-10 12:40:29 +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 7e37d1a428 pool and compress the unwrap buffer 2011-11-10 00:19:54 +11:00
Greg Wilkins 32f7822c1a Reverted the unwrapBuf to not be pooled. 2011-11-09 23:38:09 +11:00
Greg Wilkins c272c13cbf revert no content state 2011-11-09 20:28:59 +11:00
Greg Wilkins 6a266e34c8 deprecated log 2011-11-09 19:37:04 +11:00
Greg Wilkins a95d2c11e2 removed debug 2011-11-09 17:41:10 +11:00
Greg Wilkins af4c40d793 fixed SSL buffer pool 2011-11-09 17:39:59 +11:00
Greg Wilkins a36342438c cleaned up some unit tests 2011-11-09 17:03:11 +11:00
Greg Wilkins 470e63b77b added SCEP stress test 2011-11-09 16:07:36 +11:00
Greg Wilkins 71734400e9 improved handling of RST 2011-11-09 15:07:47 +11:00
Greg Wilkins 70cd06f461 only handle early EOF if exchange is not done 2011-11-09 09:18:59 +11:00
Greg Wilkins 8cfa671253 only handle early EOF if exchange is not done 2011-11-09 09:16:04 +11:00
Joakim Erdfelt 4e79ea0dca Highlight test failure with DEBUG 2011-11-08 14:51:00 -07:00
Joakim Erdfelt 4e89277210 Adjusting failing testcase to be more clear about failures 2011-11-08 14:26:34 -07:00
Joakim Erdfelt 3302d3fc60 Adjusting failing testcase to be more clear about failures 2011-11-08 14:25:10 -07:00
Greg Wilkins 4808239cbd copyright and comments 2011-11-09 08:17:56 +11:00
Greg Wilkins 5bf6f60396 copyright and comments 2011-11-09 08:13:29 +11:00
Greg Wilkins 66ea1e819a fixed test to use localhost 2011-11-09 08:13:00 +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 5f2323418b cleanups after the merge 2011-11-08 12:47:28 +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
Greg Wilkins 9907125cff improved no progress check 2011-11-07 17:14:39 +11:00
Greg Wilkins 202475aad9 clean build 2011-11-07 15:34:33 +11:00
Greg Wilkins 42179e193d client tests passing 2011-11-07 10:23:08 +11:00
Greg Wilkins 3e104548d5 fixed blocking client connection 2011-11-07 09:31:57 +11:00
Simone Bordet cb778530a4 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-11-04 20:24:35 +01:00
Thomas Becker acaa24595b 359031: Javadoc
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 20:23:56 +01: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
Thomas Becker 3d0300e60d 359031: CGI servlet changed to allow relative paths to webapp
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 15:56:18 +01:00
Thomas Becker b9f45e9426 CGI.java code format
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 15:56:18 +01:00
Simone Bordet f21752dbe3 Merge branch '360665' 2011-11-04 15:54:26 +01:00
Simone Bordet 0a40c3d750 Cleaned up test case and implementation for #360665 (Proxying HTTPS request to HTTP port causes exception loop).
Class SelectConnector.ProxySelectChannelEndPoint did not follow the latest changes to interface EndPoint, and was
returning wrong values for isInputShutdown() and other few methods.
Also suppressed expected exceptions in the test case.
2011-11-04 15:31:00 +01:00
Simone Bordet 9aee1affe5 Merged the handling of the case where there will not be more input, but the parser is in a middle state.
This case may happen when the client sends content and signal the end of the content by closing the connection.
The parser will be in a middle state, waiting for more content, and needs to read the connection close, otherwise
it may erroneously think that the exchange has failed.
2011-11-04 15:27:39 +01:00
Simone Bordet f1251412e4 Modified behavior of shutdownInput() and shutdownOutput() to always shutdown either input or output.
Calling socket.close() does not imply that socket.isInputShutdown() returns true, so there was a
possibility that code was calling ChannelEndPoint.shutdownInput(), but the input was not really
shutdown, and a subsequent call to ChannelEndPoint.isInputShutdown() returned false.
2011-11-04 15:22:43 +01:00
Thomas Becker f01877e738 360665: Fixed an endless loop on https proxy requests + added tests
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 10:20:52 +01:00
Greg Wilkins 9b60678fbf blocking client connection passing more tests 2011-11-04 16:04:48 +11: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 afd2cedfa7 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-11-03 11:07:04 -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 e207ea357e Minor update to invalid utf8 test case (expanding bad examples) 2011-11-02 17:22:32 -07:00