97d2130a8f
jetty-9 no debugging checked in
2012-11-19 15:08:53 +11:00
f336511f87
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
2012-11-08 14:58:10 +11:00
b3274a6baa
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
VERSION.txt
2012-11-08 14:41:01 +11:00
eaf65a2902
393075 1xx 204 and 304 ignore all headers suggesting content
2012-11-08 14:37:07 +11:00
eac9414f01
Merge branch 'jetty-7' into jetty-8
2012-11-05 11:52:18 -06:00
53f1892f7b
Fixing license header
2012-11-05 10:40:20 -07:00
f3af8c8650
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-05 16:28:25 +11:00
36ddd3f5d6
393368 min websocket version
2012-11-05 11:02:50 +11:00
949996931a
Fixing license (for check plugin)
2012-11-01 21:25:25 -07:00
52464a5ba6
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
8723408731
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
ba06103442
393383 delay onClose call until closeOut is done
2012-11-02 10:28:23 +11:00
6108d0df0c
393075 Jetty WebSocket client cannot connect to Tomcat WebSocket Server
...
* Adding testcase to repliate behavior as reported by bug.
2012-10-29 11:18:01 -07:00
156e33bd23
Merge remote-tracking branch 'origin/master' into jetty-8
2012-09-28 18:47:33 +10:00
494f7e48fc
add websocket test for http keyword in response message from reported issue
2012-09-25 08:18:06 -05:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05:00
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05:00
d52de82a80
Splitting up websocket module into core/client/servlet modules
2012-06-12 12:43:29 -07:00
0b56e3ae7c
jetty-9 starting to cleanup websocket and client
2012-06-07 14:11:40 +02:00
03525bfe46
jetty-9 javadoc and code cleanups
2012-03-08 15:18:17 +11:00
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
824509b0fb
jetty-9 removed plurals from enum type names
2012-02-10 00:42:44 +11: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
Greg Wilkins
Jesse McConnell
Joakim Erdfelt
Jan Bartel
Greg Wilkins
Simone Bordet
Jan Bartel