4660f35210
393733 - WebSocketClient interface should support multiple connections
...
+ Removing deprecated methods from Session
+ Fixing client side UpgradeConnection to handle extension via new
ExtensionStack object
+ Making ExtensionStack.getNegotiatedExtensions() return
List<ExtensionConfig> instead of List<String>
+ Fixing tests that relied on changes
2013-01-16 15:11:57 -07:00
1dfee4c992
393733 - WebSocketClient interface should support multiple connections
...
+ Reworking Connection Timeout handling
2013-01-16 15:11:57 -07:00
f20f0481b4
93733 - WebSocketClient interface should support multiple connections
...
+ Cleaning up no longer used items in WebSocketClient
+ Adding back Connect Timeout handling (unreliable atm)
+ Making ConnectPromise a FuturePromise with Runnable, no longer need
FutureTask
+ Making sure Session is properly opened
+ Removing need for EventDriver.awaitActiveSession()
2013-01-16 15:11:57 -07:00
acaa2aa4de
393733 - WebSocketClient interface should support multiple connections
...
* Initial pass at merging functions of WebSocketClientFactory into
WebSocketClient itself, eliminating the need for the factory.
* Introducing ConnectPromise to separate the connect future from
the client itself, hopefully allowing for multiple connections
from the client instance.
2013-01-16 15:11:56 -07:00
eff1262e49
398105 - Clean up WebSocketPolicy
2013-01-16 15:11:56 -07:00
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
5b7c19e38d
Reducing test logging noise by squelching stack traces in test cases where they are expected
2012-12-21 14:22:10 -07:00
1936a0fc51
Fixing harmless NPE seen during testing.
2012-12-21 14:00:36 -07:00
0ef9b23724
Fixing end user callback failure if runtime exception occurs, renaming enque to enqueue
2012-12-19 10:06:23 -07:00
ca1c3db642
Removing WriteResult class
2012-12-14 16:12:48 -07:00
e308f843db
Replacing FrameBytes tree with WriteBytesProvider class
2012-12-14 16:12:48 -07:00
ecb472f30b
Introducing WriteBytesProvider
2012-12-14 16:12:48 -07:00
6bfc19be1b
jetty-9 optimisation to dispatch before parsing so that handling is done in same thread
2012-12-14 09:50:22 +11:00
c8c15a4063
Removing test for inputClosed on BlockheadClient to fix test failure.
2012-12-13 13:28:05 -07:00
60598c5c73
396518 - Websocket AB Tests should test for which side disconnected and closed.wasClean
...
+ adding AbstractWebSocketConnection.onWriteWebSocketClose() to allow
for different behavior between client vs server TCP disconnect logic.
2012-12-13 13:28:05 -07:00
bf3c5c7922
add in some handshake state tracking into IOState to help track who initiated closes
2012-12-13 12:18:30 -06:00
a386a46045
396518 - Websocket AB Tests should test for which side disconnected and closed.wasClean
...
* Adding stubbed out example in Fuzzer for wasClean.
2012-12-13 09:33:12 -07:00
9bbfcd7e62
More websocket threading issues
...
* Using new IOState object in AbstractWebSocketConnection to better
manage close handshake state and replies.
* Cleaning up many bad BufferPool.release() calls against ByteBuffers
that didn't arrive from BufferPool.acquire()
* Removing many ByteBuffer.wrap() calls.
* Fixing FrameCompression / MessageCompression extension handling
of ByteBuffers
2012-12-12 11:06:15 -07:00
756b13700b
Handling properly connect exceptions, notifying the failure to the websocket client.
2012-12-12 18:34:22 +01:00
f3d53918b5
Guarding against NPE if the masker is null.
2012-12-12 14:14:18 +01:00
9a71d75003
Fixing threading issue in testcase
2012-12-11 13:01:54 -07:00
d161673ff7
Add masker to client factory
2012-12-11 07:44:52 -06:00
a2a5a97bfe
add some methods to the ServletWebSocketRequest and rename one method
2012-12-10 12:16:06 -06:00
4ff9c2cea1
Setting problematic test to @Ignore
2012-12-10 10:20:48 -07:00
baaf94eeae
Fixing write of large websocket frames (25MB+)
...
+ Using ForkInvoker from util
+ Using FrameBytes logic from SPDY
+ Fixing bad flush logic
+ Fixing lazy BufferPool.release() logic
+ Fixing Buffer reuse issue
+ Fixing BlockheadServer to use ExtensionStack
+ Moving WriteResultFuture helper classes out of tests into main
+ Introducing common IOState handling for common close handshake use
2012-12-10 09:23:18 -07:00
3e151901bf
jetty-9 Use public HttpField
2012-12-08 01:41:01 +11:00
a20d984d30
jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap
2012-12-08 01:41:00 +11:00
11cbe274af
395344 Move JSR-356 (Java WebSocket API) work off to Jetty 9.1.x
2012-11-28 16:55:13 -07:00
2d851212ba
Validating obtaining Local/Remote address from connection object
2012-11-27 15:23:55 -07:00
d8b1444609
Changing to ClientUpgrade(Request|Response)
2012-11-27 15:00:22 -07:00
acaeb7663a
Making sure websocket server tests validate Sec-WebSocket-Accept on response headers
2012-11-27 12:40:28 -07:00
f89909e301
jetty-9 cleaning up dependencies
2012-11-23 16:25:57 +11:00
7737dc8c76
394854 Implemented Promise
2012-11-23 12:18:51 +11:00
fdc9428c6f
[maven-release-plugin] prepare for next development iteration
2012-11-19 18:06:01 -06:00
d89b6f9b88
[maven-release-plugin] prepare release jetty-9.0.0.M3
2012-11-19 18:05:54 -06:00
a0c1d85094
Revert "jetty-9 cleaned up serverClasses to minimum"
...
This reverts commit 67b5caadbb
2012-11-19 10:33:54 -06:00
67b5caadbb
jetty-9 cleaned up serverClasses to minimum
2012-11-19 17:42:52 +11:00
97d2130a8f
jetty-9 no debugging checked in
2012-11-19 15:08:53 +11:00
4ff9bdc54d
jetty-9 alternative websocket discovery
2012-11-15 21:23:43 +11:00
deed4e3db1
Fixing license header
2012-11-13 14:56:10 -07:00
d229364f9d
Fixing jetty-osgi for new websocket artifacts
2012-11-13 12:50:27 -07:00
169498cd9d
Fixing Frame Decompress to work in Chrome 20.x
2012-11-12 20:52:54 -07:00
d67fdfdd85
Splitting out websocket-servlet to make it more friendly for WebAppClassloader
2012-11-12 19:42:32 -07:00
42ec683297
Merge from 'master' to 'ws-refactor'
2012-11-12 16:22:11 -07:00
80f5fa1a18
Attempting to get Mux sub-channel to flow thru server as well
2012-11-12 16:02:41 -07:00
dd0b1a39b8
Stubbing out mux client/server specific pieces
2012-11-12 16:02:41 -07:00
884f1a3eff
New ExtensionStack to manage Extensions easier and more consistently
2012-11-12 16:02:05 -07:00
8548331735
Ripping out javax.net.websocket.extension.* SPI as it is going away
2012-11-12 12:36:39 -07: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
09625a64e2
Adding more diagrams for javax.net.websocket layers
2012-11-07 12:01:25 -07:00
802e97e6fb
Removing WebSocketClient.getConnection() as inappropriate
2012-11-07 11:00:46 -07:00
4a8a1228fc
Moving client-side mux specifics to internal
2012-11-07 06:06:08 -07:00
473ff032ae
Promoting ClientUpgradeRequest and ClientUpgradeResponse to non-internal use
2012-11-07 06:05:36 -07:00
fc371fc7e6
UpgradResponse headers are now case insensitive
2012-11-06 17:07:55 -07:00
9be64bab11
Making changes to client / server from api / common
2012-11-06 16:58:54 -07:00
414f964afd
Making changes to client / server from api / common
2012-11-06 16:58:49 -07:00
a7968c07be
Rolling Extension and ExtensionConfig change into rest of websocket-common
2012-11-06 15:51:23 -07:00
11ff35ccbb
Adding missing @Override's
2012-11-06 15:50:27 -07:00
e625689a1c
Using Extension interface, not AbstractExtension
2012-11-06 15:49:57 -07:00
b6a4e04b38
Removing RequestedExtensionConfig in favor of new ExtensionConfig class implementation in .api
2012-11-06 15:49:16 -07:00
48e0cf1fb7
Consolidating duplicate functionality of ExtensionRegistry and ExtensionFactory
2012-11-06 15:48:44 -07:00
3d94916790
Making ExtensionConfig an object, not an interface
2012-11-06 15:47:31 -07:00
5eb5eb818f
Brining over important getters for jetty Extension
2012-11-06 15:46:49 -07:00
000cfe6986
Fixing UpgradeRequest / UpgradeResponse hierarchy.
2012-11-06 15:45:13 -07:00
57c97505c8
Removing providedon javax.net.websocket
2012-11-06 15:42:06 -07:00
17c6e04f47
Making rest of the modules use websocket-common (instead of old websocket-core)
2012-11-05 17:58:06 -07:00
2e3447f6ef
Making .common pass all existing tests
2012-11-05 17:57:39 -07:00
b37bd2b665
Exclude Continuations from Frame.Type
2012-11-05 17:57:04 -07:00
053f91c8a0
Refactoring .core to .common and updating for .api
2012-11-05 17:18:44 -07:00
c1ce7780a6
Updating rest for websocket-api
2012-11-05 12:01:42 -07:00
eb2e42d402
Updating jetty-websocket-api classes
2012-11-05 12:01:26 -07:00
bb27f561c1
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:24:06 -06:00
1d767e99a3
[maven-release-plugin] prepare release jetty-8.1.8.v20121105
2012-11-05 12:23:59 -06:00
70d591c430
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:16:03 -06:00
017826b4eb
[maven-release-plugin] prepare release jetty-7.6.8.v20121105
2012-11-05 12:15:57 -06: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
d19f177cae
First step
2012-11-02 11:42:44 -07:00
e310b0a0ec
Attempting to get Mux sub-channel to flow thru server as well
2012-11-02 11:20:36 -07: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
88ed9ff710
Stubbing out mux client/server specific pieces
2012-11-01 13:43:33 -07:00
171fa2db67
More use of StringUtil.truncate
2012-10-31 13:27:21 -07:00
01c9e650fb
First working TEXT echo thru the muxer (as test case)
2012-10-31 11:07:10 -07:00
61c607076a
Mux interrim work.
2012-10-30 16:17:03 -07: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
add3c2b381
392237 improved names and examples for documentation
2012-10-29 17:59:39 +11:00
1b6d919d8c
Adding logging on read timeout
2012-10-23 15:29:07 -07:00
3e2aee293e
Cleaning up close handshake and noisy tests
2012-10-23 12:16:29 -07:00
4f7c66ae81
Using NO_CODE instead of -1 for close frame with no status code declared
2012-10-23 12:16:29 -07:00
2b13648b0e
392237 fixed many TODOs and many minor code cleanups
2012-10-19 16:17:30 +11:00
Joakim Erdfelt
Jesse McConnell
Greg Wilkins
Simone Bordet
Jan Bartel