8b20316efc
Merge branch 'master' into jetty-8
2012-02-24 06:48:50 -06:00
2e66e54425
370387 - SafariWebsocketDraft0Test failure during build.
...
The reason for the failure of this test was that a BufferedReader was used to read the header lines.
However, the buffered reader may have read and buffered also the hixie bytes and subsequently,
when the test was trying to read the hixie bytes directly from the input stream (and not from the
buffered reader), the read was timing out.
Fixed by always using the input stream to read the header and hixie bytes.
2012-02-24 11:26:50 +01:00
098428dd37
Merge branch 'master' into jetty-8
2012-02-15 13:49:23 -06:00
4caf662182
Improve test failure on truncated Draft0 handshake read.
...
+ If a truncated response occurs, attempt to have the test case produce
a meaningful response message indicating where/how the truncation
occured, instead of just a 'read timeout'.
2012-02-13 11:46:20 -07:00
e7608eafae
Trying to get more information from failing Websocket Draft0 test failure
2012-02-13 11:06:02 -07:00
f7fd3a4680
Bumping up socket read timeout and adding debug.
2012-02-09 15:39:49 -07:00
98684397fd
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-18 14:17:41 +11:00
b6a51f0c06
Updating testcase to indicate reason of failure (when testing on OSX)
2012-01-17 13:33:41 -07:00
b8e0258faf
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java
2012-01-12 11:01:03 +11:00
c5e3ed5afe
improved test timing
2012-01-11 16:39:03 +11:00
1fbec51c8a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-10 16:08:59 +11:00
27cbf0bf78
367099 - Upgrade jetty-websocket for RFC 6455 - Addendum.
...
The WebSocket parser was forgot in the renaming.
Took also the chance to remove hardcoded "D13" string in toString() methods.
2012-01-09 20:27:46 +01:00
71ea564f0b
368189 - WebSocketClientFactory should not manage external thread pool.
2012-01-09 20:15:22 +01:00
06f0498a48
Made tests more reliable by waiting for the websocket connection to be established
...
and for onOpen() to be called.
2012-01-03 12:15:51 +01:00
3141b50fa0
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-30 20:19:39 +11:00
2b54d45280
367435 improved D00 test harness
2011-12-28 13:35:44 +11:00
3a1aff9221
Using a random port for the tests.
2011-12-23 23:59:05 +01:00
3cda41248e
367502 - WebSocket connections should be closed when application context is stopped.
2011-12-23 23:43:02 +01:00
62f47e0617
367502 - WebSocket connections should be closed when application context is stopped.
2011-12-23 17:20:57 +01:00
ed46b71f37
Merge branch 'master' into jetty-8
2011-12-23 07:44:29 -06:00
34dc926c59
367433 added tests to investigate
2011-12-23 19:19:20 +11:00
b36425b7aa
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2011-12-22 09:52:11 +11:00
ef23bf11b8
Merged from origin/master.
2011-12-21 10:45:06 +01:00
c3643d9937
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-21 12:37:23 +11:00
2ca897c1ea
367219 - WebSocketClient.open() fails when URI uses default ports.
...
+ Fixing testcase to not fail if http://localhost/ exists.
Reworking code to not rely on existence of server to validate the
correct behavior of URI port parsing.
2011-12-20 13:01:23 -07:00
8ea22a6a4c
367219 - WebSocketClient.open() fails when URI uses default ports.
2011-12-20 18:01:45 +01:00
070a2b5759
JETTY-1463 websocket D0 parser should return progress even if no fill done
2011-12-20 14:54:50 +11:00
b67961ada3
JETTY-1463 websocket D0 parser should return progress even if no fill done
2011-12-20 12:00:48 +11:00
960407492a
Removing System.out debug
2011-12-19 13:13:57 -07:00
93ebd1dbe5
Using straight Socket as HttpURLConnection request header modifications are not reliable enough for testing purposes
2011-12-19 13:06:54 -07:00
95f763fab4
Bug 367099 - Upgrade jetty-websocket for RFC 6455
...
+ Adding new RFC declared close codes 1011 (CLOSE_SERVER_ERROR) and
1015 (CLOSE_FAILED_TLS_HANDSHAKE)
+ Adding support for responding as CLOSE_SERVER_ERROR if an unhandled
exception (similar to how HTTP error 500 works) but for exceptions
thrown out of implementations of WebSocket.
+ Adding guard to prevent use of CLOSE_FAILED_TLS_HANDSHAKE on
close control frame.
+ Adding unit test for the CLOSE_SERVER_ERROR case.
+ Adding unit test for HTTP response 400 on bad Sec-WebSocket-Version
request header value.
2011-12-19 12:29:15 -07:00
874a6502f4
Adding missing license headers.
2011-12-19 10:06:58 -07:00
6d907fa61d
Bug 367099 - Upgrade jetty-websocket for RFC 6455
...
+ Renaming *D13 classes to *RFC6455 per dicussion in jetty-dev mailing
list
2011-12-19 10:03:01 -07:00
300157fb2d
more time needed for ssl test on slow machine
2011-12-14 12:01:23 -08:00
5c5f783e2b
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-14 11:42:34 -08:00
bc48eb1f5b
366730 pass the time idle to onIdleExpire
2011-12-14 11:41:32 -08:00
6b42a1c45d
JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
...
+ Implementation of Safari WebSocket Draft-0 behavior in a unit test.
(Test fails, and is currently set as @Ignore)
2011-12-14 10:23:40 -07:00
42816041c0
JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
...
+ Adding unit test to attempt to replicate behavior (test passes)
2011-12-13 11:26:30 -07:00
bcbcbafb14
More tests for WebSocket over SSL.
2011-12-13 11:15:04 +01:00
0689e05e9b
365750 - Support WebSocket over SSL, aka wss://
...
This is now implemented, using the new architecture of wrapping the connection with
SslConnection.
The only refactoring was to avoid that the HTTP handshake was sent from the
HandshakeConnection constructor, because at that point the SSL wiring is not ready yet.
Now the handshake is sent from handle(), guarded by a boolean variable to sent it once.
2011-12-06 16:25:15 +01:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
55d5020980
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
7fb371a7ad
Fixing testcase failure on blocking read/write during WebSocketClient use
2011-11-15 14:47:42 -07:00
921b285235
Avoid flush if no content to flush
2011-11-10 14:45:28 +11:00
2a6b8696d7
Merge branch 'master' into jetty-8
2011-11-08 15:59:55 -06:00
29fa330a6e
363124 improved websocket close handling
2011-11-09 07:09:13 +11:00
21e692aee6
363124 improved websocket close handling
2011-11-08 18:18:34 +11:00
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
Jesse McConnell
Simone Bordet
Joakim Erdfelt
Jan Bartel
Greg Wilkins