Commit Graph

88 Commits

Author SHA1 Message Date
Joakim Erdfelt ecb472f30b Introducing WriteBytesProvider 2012-12-14 16:12:48 -07:00
Joakim Erdfelt 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
Simone Bordet 756b13700b Handling properly connect exceptions, notifying the failure to the websocket client. 2012-12-12 18:34:22 +01:00
Simone Bordet f3d53918b5 Guarding against NPE if the masker is null. 2012-12-12 14:14:18 +01:00
Joakim Erdfelt 9a71d75003 Fixing threading issue in testcase 2012-12-11 13:01:54 -07:00
Jesse McConnell d161673ff7 Add masker to client factory 2012-12-11 07:44:52 -06:00
Joakim Erdfelt 4ff9c2cea1 Setting problematic test to @Ignore 2012-12-10 10:20:48 -07:00
Joakim Erdfelt 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
Joakim Erdfelt 11cbe274af 395344 Move JSR-356 (Java WebSocket API) work off to Jetty 9.1.x 2012-11-28 16:55:13 -07:00
Joakim Erdfelt 2d851212ba Validating obtaining Local/Remote address from connection object 2012-11-27 15:23:55 -07:00
Joakim Erdfelt d8b1444609 Changing to ClientUpgrade(Request|Response) 2012-11-27 15:00:22 -07:00
Greg Wilkins 7737dc8c76 394854 Implemented Promise 2012-11-23 12:18:51 +11:00
Joakim Erdfelt 42ec683297 Merge from 'master' to 'ws-refactor' 2012-11-12 16:22:11 -07:00
Joakim Erdfelt 80f5fa1a18 Attempting to get Mux sub-channel to flow thru server as well 2012-11-12 16:02:41 -07:00
Joakim Erdfelt dd0b1a39b8 Stubbing out mux client/server specific pieces 2012-11-12 16:02:41 -07:00
Joakim Erdfelt 8548331735 Ripping out javax.net.websocket.extension.* SPI as it is going away 2012-11-12 12:36:39 -07:00
Joakim Erdfelt 802e97e6fb Removing WebSocketClient.getConnection() as inappropriate 2012-11-07 11:00:46 -07:00
Joakim Erdfelt 4a8a1228fc Moving client-side mux specifics to internal 2012-11-07 06:06:08 -07:00
Joakim Erdfelt 473ff032ae Promoting ClientUpgradeRequest and ClientUpgradeResponse to non-internal use 2012-11-07 06:05:36 -07:00
Joakim Erdfelt fc371fc7e6 UpgradResponse headers are now case insensitive 2012-11-06 17:07:55 -07:00
Joakim Erdfelt 9be64bab11 Making changes to client / server from api / common 2012-11-06 16:58:54 -07:00
Joakim Erdfelt 17c6e04f47 Making rest of the modules use websocket-common (instead of old websocket-core) 2012-11-05 17:58:06 -07:00
Joakim Erdfelt e310b0a0ec Attempting to get Mux sub-channel to flow thru server as well 2012-11-02 11:20:36 -07:00
Greg Wilkins 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
Joakim Erdfelt 88ed9ff710 Stubbing out mux client/server specific pieces 2012-11-01 13:43:33 -07:00
Joakim Erdfelt 3e2aee293e Cleaning up close handshake and noisy tests 2012-10-23 12:16:29 -07:00
Greg Wilkins 2b13648b0e 392237 fixed many TODOs and many minor code cleanups 2012-10-19 16:17:30 +11:00
Joakim Erdfelt 57abd6fded Per hybi list, adding no-cache to outgoing client request to prevent bad
intermediaries from attempting to cache the upgrade response.
2012-10-15 07:18:35 -07:00
Joakim Erdfelt 0cc7b5f907 Bug 391590 - WebSocket client needs ability to set requested extensions
* Adding UpgradeRequest.addExtensions(String ... extConfigs) interface
* Implementing in WebSocket Client & WebSocket Server
* Fixing case sensitive ClientUpgradeRequest.getHeaderValues(String key)
2012-10-10 11:19:06 -07:00
Joakim Erdfelt cae79aabc5 Fixing naming 2012-10-10 11:15:44 -07:00
Simone Bordet 2748a9381e jetty-9: Added support for connect timeout. 2012-10-08 11:05:26 +02:00
Joakim Erdfelt 41ea028706 Adding websocket client example 2012-10-04 14:02:36 -07:00
Joakim Erdfelt d23215f3f4 Bug 391140 - Implement x-webkit-deflate-frame extension as-used by Chrome/Safari 2012-10-04 10:11:50 -07:00
Joakim Erdfelt cda1c4588f Reworking EventDriver to be mroe generic and not use reflection in 100% of cases 2012-09-26 13:43:17 -07:00
Hugues Malphettes 1cfa277c6c jetty-9 osgi support 2012-09-24 13:04:57 +08:00
Greg Wilkins 68ee346b8a jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle 2012-09-21 11:45:51 +10:00
Joakim Erdfelt 857498b115 Upgrading to junit-dep-4.10.jar (banning junit.jar) 2012-09-20 11:52:59 -07:00
Joakim Erdfelt b10a10797d Making websocket-core have a unique package org.eclipse.jetty.websocket.core to conform to osgi requirements 2012-09-18 10:01:01 -07:00
Joakim Erdfelt e46617ad8a Moving maskers from core to client, where it belongs 2012-09-17 14:38:27 -07:00
Joakim Erdfelt 515804a463 Fixing connection.onOpen() 2012-09-14 15:10:54 -07:00
Simone Bordet 88cbfed7e0 jetty-9 - Made SelectorManager.connection[Opened|Closed]() concrete, since they are overridden only by SelectChannelConnector. 2012-09-14 23:30:21 +02:00
Joakim Erdfelt 6ebd96e9bd Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-09-14 10:41:23 -07:00
Joakim Erdfelt c7404731c9 Starting removal of WebSocketPolicy.getBufferSize() 2012-09-14 10:41:11 -07:00
Greg Wilkins 22ba57b8d2 jetty-9 refactored onOpen and onClose 2012-09-14 17:38:47 +10:00
Joakim Erdfelt 3ba074ecc8 Adding .STACKS=(boolean) support to StdErrLog configuration 2012-09-06 12:33:38 -07:00
Simone Bordet 7231c82b69 Merged branch 'jetty-9' into jetty-9-client. 2012-09-06 08:41:48 +02:00
Joakim Erdfelt 4f36513744 More work around close handshake testing 2012-09-04 14:53:34 -07:00
Greg Wilkins c3776764f4 jetty-9 ConcurrentScheduler refinements 2012-09-03 15:24:36 +10:00
Greg Wilkins 83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Simone Bordet 4de5b0ad63 Merged branch 'jetty-9' into jetty-9-client. 2012-08-30 17:24:49 +02:00