Greg Wilkins
|
68d562008e
|
353073 draft 12 update
|
2011-08-25 14:05:12 +10:00 |
|
Greg Wilkins
|
def117775d
|
353073 recycle buffer
|
2011-08-25 12:28:49 +10:00 |
|
Greg Wilkins
|
44b8d56289
|
353073 updated to draft 11
|
2011-08-24 10:28:39 +10:00 |
|
Greg Wilkins
|
ee1afa5e97
|
353073 cleaned up no context logging
|
2011-08-16 17:59:28 +10:00 |
Jan Bartel
|
6e8afd6795
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
VERSION.txt
|
2011-08-16 11:35:46 +10:00 |
|
Greg Wilkins
|
2cb0cd377e
|
353073 better close messages
|
2011-08-15 15:19:14 +10:00 |
|
Jan Bartel
|
050cb83b35
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
jetty-websocket/pom.xml
|
2011-08-12 18:43:15 +10:00 |
|
Greg Wilkins
|
c07e14840c
|
353073 Support fake fragements, so that frames may be larger than buffers
|
2011-08-11 13:26:12 +10:00 |
|
Greg Wilkins
|
d63294bfe4
|
353073 Improved client javadoc
|
2011-08-11 12:18:36 +10:00 |
|
Greg Wilkins
|
6b9ecd0806
|
353073 Improved client API to use futures
|
2011-08-11 11:50:23 +10:00 |
|
Greg Wilkins
|
5ea2806c08
|
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
Conflicts:
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
|
2011-08-09 15:45:17 +10:00 |
|
Greg Wilkins
|
75dacc2b61
|
fixed websocket client tests
|
2011-08-09 15:39:26 +10:00 |
Jesse McConnell
|
3dd582475b
|
Resolve test case issue with comment for Greg on proper order of on*
responses for websocket interface
|
2011-08-05 12:44:41 -05:00 |
Joakim Erdfelt
|
f930050a4a
|
Working out what testBadHandshake keeps failing
|
2011-08-05 10:11:38 -07:00 |
|
Joakim Erdfelt
|
300f449e6f
|
Working out what testBadHandshake keeps failing
|
2011-08-05 09:55:51 -07:00 |
|
Joakim Erdfelt
|
1b51da30f4
|
Working out what testBadHandshake keeps failing
|
2011-08-05 09:30:23 -07:00 |
|
Jan Bartel
|
02a66a00fb
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
VERSION.txt
jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
pom.xml
|
2011-08-01 14:39:39 +10:00 |
|
Greg Wilkins
|
2806869cfd
|
353073 test harness for websocket client and improved ietf draft 10 compliance
|
2011-08-01 12:35:01 +10:00 |
|
Greg Wilkins
|
5859a85919
|
353073 WebSocketClient
|
2011-07-26 17:31:55 +10:00 |
|
Jan Bartel
|
86f7e76c4d
|
Merge of jetty-7 into jetty-8
Conflicts:
VERSION.txt
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-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/pom.xml
jetty-nested/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/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/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-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
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-07-11 12:05:58 +10:00 |
|
Greg Wilkins
|
17e907c2fb
|
git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
|
2011-07-07 18:18:24 +10:00 |
Greg Wilkins
|
451580e4ee
|
349897 draft -09 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3409 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-21 05:33:52 +00:00 |
|
Greg Wilkins
|
554309e5ac
|
344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3059 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-03 02:09:54 +00:00 |
|
Greg Wilkins
|
9f6e934c4f
|
344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3054 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-02 09:30:21 +00:00 |
|
Greg Wilkins
|
88bfdd6631
|
344059 added extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3053 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-02 09:20:36 +00:00 |
|
Greg Wilkins
|
a70bbc004d
|
344059 extension framework for websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3052 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-02 01:42:05 +00:00 |
|
Greg Wilkins
|
3e35b74651
|
344059 Websockets draft-07
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3035 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-27 23:27:56 +00:00 |
|
Greg Wilkins
|
58652d8f09
|
342700 refine websocket API for anticipated changes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3013 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-13 11:05:35 +00:00 |
|
Greg Wilkins
|
d3c5eddd79
|
342504 Scanner Listener
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2999 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-12 02:12:52 +00:00 |
|
Greg Wilkins
|
a6483bfa6f
|
340265 Improve handling of io shutdown in SSL
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2906 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-23 03:36:06 +00:00 |
|
Greg Wilkins
|
c26cc92857
|
337685 improved progress return
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2888 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-14 13:26:41 +00:00 |
|
Greg Wilkins
|
3a267d9dd8
|
JETTY-1245 Pooled Buffers implementation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2885 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-14 03:09:56 +00:00 |
|
Greg Wilkins
|
31d8e8b3dc
|
337685 more common code
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2880 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-11 05:00:45 +00:00 |
|
Greg Wilkins
|
e20fa91252
|
337685 Update websocket API in preparation for draft -07
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2877 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-10 13:15:27 +00:00 |
|
Greg Wilkins
|
1a6cdeb12f
|
338880 Fixed failing buffer range checks
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2858 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-07 02:51:05 +00:00 |
|
Greg Wilkins
|
13a46c3e9c
|
337685 java 1.5
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2843 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-01 22:33:16 +00:00 |
|
Greg Wilkins
|
0a0deacb62
|
337685 Work in progress on draft 6 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2834 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-01 06:10:15 +00:00 |
|
Greg Wilkins
|
75960baeb1
|
337685 Work in progress on draft 6 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2833 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-01 01:21:54 +00:00 |
|
Greg Wilkins
|
2cc4fbb5ee
|
337685 Work in progress on draft 6 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2831 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-02-28 09:45:41 +00:00 |
|
Greg Wilkins
|
a4f122930a
|
337685 Work in progress on draft 5 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2810 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-02-22 03:32:07 +00:00 |
|
Greg Wilkins
|
2c280fd1c4
|
proposal for websocket nonce
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2465 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-11-03 02:46:44 +00:00 |
|
Greg Wilkins
|
de178f18c6
|
324369 Improved handling of multiple versions of draft-ietf-hybi-thewebsocketprotocol
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2342 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-10-13 00:34:30 +00:00 |
|
Greg Wilkins
|
2181a0de40
|
324369 Implement draft-ietf-hybi-thewebsocketprotocol-01
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2285 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-20 20:25:08 +00:00 |
|
Greg Wilkins
|
e4cced21e8
|
325105 websocket ondisconnect fixed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2274 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-14 12:08:46 +00:00 |
|
Greg Wilkins
|
837b477f12
|
325105 websocket ondisconnect fixed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2273 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-14 11:47:07 +00:00 |
|
Greg Wilkins
|
55f10af59e
|
325128 websocket send during onConnect
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2272 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-14 09:13:50 +00:00 |
|
Greg Wilkins
|
1596451908
|
324369 Implement draft-ietf-hybi-thewebsocketprotocol-01
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2245 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-03 07:05:53 +00:00 |
|
Greg Wilkins
|
995df89b22
|
324369 Implement draft-ietf-hybi-thewebsocketprotocol-01
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2242 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-03 03:41:05 +00:00 |
|
Greg Wilkins
|
d29c110a31
|
314581 Implement the Sec-Websocket handshake
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1899 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-05-26 22:56:02 +00:00 |
|
Greg Wilkins
|
2b03bc5c5b
|
reduced stress on load test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1720 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-05-05 12:31:12 +00:00 |
Simone Bordet
|
1445b94b8e
|
Added websocket load test that shows that #309369 (Using websockets in multithreaded environment causes threads to block each other due to the synchronization done while scheduling a new Timeout task) is not a bug.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1686 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-05-04 11:58:16 +00:00 |
|
Simone Bordet
|
b0f02acc45
|
Fixes #308868 (Update test suite to JUnit4 - Module jetty-websocket).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1599 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-04-27 14:59:55 +00:00 |
|
Simone Bordet
|
9e4f1fd335
|
Fixed bug where a buffer not entirely flushed by the I/O system was called skip() twice.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1441 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-04-02 10:28:17 +00:00 |
|
Simone Bordet
|
f1c3f3e42c
|
Fixed encoding of the length in case of binary messages.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1438 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-04-02 08:03:42 +00:00 |
|
Simone Bordet
|
529e04295f
|
Fixed tests.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1437 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-04-01 21:24:25 +00:00 |
|
Simone Bordet
|
6fdd5c9677
|
Fixes #307898 (websocket does not handle messages larger than a buffer).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1436 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-04-01 17:20:28 +00:00 |
|
Greg Wilkins
|
d208d55652
|
294563 removed UpgradeConnectionException from websocket handling
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1263 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-02-11 01:31:17 +00:00 |
|
Greg Wilkins
|
9a02a4e57a
|
no frame byte
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1225 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-02-01 02:59:43 +00:00 |
|
Greg Wilkins
|
9dfabfb184
|
max idle time for websocket
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1116 7e9141cc-0065-0410-87d8-b60c137991c4
|
2009-12-02 03:38:07 +00:00 |
|
Greg Wilkins
|
d7f7382bf5
|
test websocket client
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1114 7e9141cc-0065-0410-87d8-b60c137991c4
|
2009-12-02 00:02:03 +00:00 |
|
Greg Wilkins
|
d2898371e3
|
clean up tests
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1089 7e9141cc-0065-0410-87d8-b60c137991c4
|
2009-11-24 00:00:17 +00:00 |
|
Greg Wilkins
|
f9455c7712
|
demo websocket implementation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1087 7e9141cc-0065-0410-87d8-b60c137991c4
|
2009-11-23 08:44:37 +00:00 |
|
Greg Wilkins
|
bf6faf32bb
|
updates
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1082 7e9141cc-0065-0410-87d8-b60c137991c4
|
2009-11-20 13:53:12 +00:00 |
|
Greg Wilkins
|
f40e50715e
|
websocket test server
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1074 7e9141cc-0065-0410-87d8-b60c137991c4
|
2009-11-19 21:48:58 +00:00 |
|
Greg Wilkins
|
2a3750fe1e
|
294563 Initial websocket implementation working
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1043 7e9141cc-0065-0410-87d8-b60c137991c4
|
2009-11-12 03:27:35 +00:00 |
|
Greg Wilkins
|
c2f081ae8c
|
WebSocketGenerator
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1041 7e9141cc-0065-0410-87d8-b60c137991c4
|
2009-11-09 07:15:03 +00:00 |
|
Greg Wilkins
|
bb1bb0b960
|
294563 Initial websocket implementation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1040 7e9141cc-0065-0410-87d8-b60c137991c4
|
2009-11-09 01:22:06 +00:00 |