Commit Graph

1132 Commits

Author SHA1 Message Date
Joakim Erdfelt 1aa6e63d25 395232 - UpgradeRequest object passed to createWebSocket() has null Session
+ Server side UpgradeRequest.getSession() now has HttpSession (if
  it has already been created)
2013-01-31 11:26:17 -07:00
Jesse McConnell 5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00
Joakim Erdfelt 32cb1045ba Fixing logger name 2013-01-31 09:35:27 -07:00
Jesse McConnell a5e1e04af1 [maven-release-plugin] prepare for next development iteration 2013-01-31 08:42:20 -06:00
Jesse McConnell b7fb18fd65 [maven-release-plugin] prepare release jetty-7.6.9.v20130131 2013-01-31 08:42:12 -06:00
Joakim Erdfelt 728201fa3e Making Simone jubilantly happy :-) 2013-01-30 14:02:52 -07:00
Joakim Erdfelt b2951bdf5d 396428 - Test for WebSocket masking on client fragments per RFC 6455 Sec 5.1 2013-01-30 13:51:49 -07:00
Joakim Erdfelt 25b0bd73a6 399516 - Websocket UpgradeException should contain HTTP Request/Response information
+ Added UpgradeException.requestURI and UpgradeException.responseStatusCode
2013-01-30 13:13:29 -07:00
Joakim Erdfelt 60088fa274 399515 - Websocket-client connect issues should report to websocket onError handlers 2013-01-30 12:15:15 -07:00
Joakim Erdfelt f46ad8bbab Using HttpCookieStore.Empty from jetty-util instead 2013-01-30 09:56:09 -07:00
Joakim Erdfelt 5e8aa4eeb3 399421 - Add websocket.api.Session.disconnect() for harsh low level connection disconnect 2013-01-29 15:56:30 -07:00
Joakim Erdfelt cd38a7999e 399397 - websocket-client needs better upgrade failure checks
+ Adding checks on response status code and Connection header (along
  with unit tests)
2013-01-29 14:44:56 -07:00
Joakim Erdfelt 4f48bc7e7b 399343 - OnWebSocketConnect should use api.Session parameter instead.
+ Changed method signature for WebSocketListener and the various
  @OnWebSocket* annotations
2013-01-29 13:22:38 -07:00
Joakim Erdfelt 871b64cf38 Bug 399344 - Add missing @OnWebSocketError annotation 2013-01-29 13:22:38 -07:00
Joakim Erdfelt 335611815c 399173: UpgradeRequest.getParameterMap() should never return null
+ Making api.UpgradeRequest never return null, but also have no logic on
  how to populate the parameter map
+ Using MultiMap in websocket-client for parameter map parsing
+ Using HttpServletRequest.getParameterMap() as-is in websocket-server
+ Adding unit testing for both sides
2013-01-28 17:11:51 -07:00
Joakim Erdfelt 7adc77a5d5 Adding -tests classifier artifacts to deploy/release to aide in quickstart documentation 2013-01-25 12:19:17 -07:00
Joakim Erdfelt 3975ae74cb Moving test from jetty-parent to jetty-client module 2013-01-25 12:06:17 -07:00
Joakim Erdfelt 7211ce230e Removing unused websocket-core files, detrius from old merge 2013-01-23 10:50:37 -07:00
Joakim Erdfelt bfba20565a Removing out of date mux diagrams 2013-01-23 10:49:07 -07:00
Joakim Erdfelt f9cb26b5a7 Removing jsr diagrams from common, should only exist in jsr branch (for now) 2013-01-23 10:48:51 -07:00
Joakim Erdfelt c31f3a5501 Updating diagrams 2013-01-23 10:47:59 -07:00
Joakim Erdfelt 2e216dddb7 Consolidating WebSocketPolicy.setMax*Size() into single setMaxMessageSize() 2013-01-18 09:27:56 -07:00
Simone Bordet 1ca0f004c3 Updated signature of setConnectTimeout(int) to setConnectTimeout(long)
to comply with field type and getter type.
Removed check that was throwing an exception if connect timeout was set
after start.
2013-01-18 10:35:20 +01:00
Joakim Erdfelt b938245b14 Adding some javadoc, cleaning up package namespaces where appropriate 2013-01-17 15:41:33 -07:00
Joakim Erdfelt e0b3c1b926 Making sure cookies are set 2013-01-16 15:11:57 -07:00
Joakim Erdfelt 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
Joakim Erdfelt 1dfee4c992 393733 - WebSocketClient interface should support multiple connections
+ Reworking Connection Timeout handling
2013-01-16 15:11:57 -07:00
Joakim Erdfelt 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
Joakim Erdfelt 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
Joakim Erdfelt eff1262e49 398105 - Clean up WebSocketPolicy 2013-01-16 15:11:56 -07:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell 863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins 31def06214 jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported 2012-12-24 19:17:00 +11:00
Joakim Erdfelt 5b7c19e38d Reducing test logging noise by squelching stack traces in test cases where they are expected 2012-12-21 14:22:10 -07:00
Joakim Erdfelt 1936a0fc51 Fixing harmless NPE seen during testing. 2012-12-21 14:00:36 -07:00
Joakim Erdfelt 0ef9b23724 Fixing end user callback failure if runtime exception occurs, renaming enque to enqueue 2012-12-19 10:06:23 -07:00
Joakim Erdfelt ca1c3db642 Removing WriteResult class 2012-12-14 16:12:48 -07:00
Joakim Erdfelt e308f843db Replacing FrameBytes tree with WriteBytesProvider class 2012-12-14 16:12:48 -07:00
Joakim Erdfelt ecb472f30b Introducing WriteBytesProvider 2012-12-14 16:12:48 -07:00
Greg Wilkins 6bfc19be1b jetty-9 optimisation to dispatch before parsing so that handling is done in same thread 2012-12-14 09:50:22 +11:00
Joakim Erdfelt c8c15a4063 Removing test for inputClosed on BlockheadClient to fix test failure. 2012-12-13 13:28:05 -07:00
Joakim Erdfelt 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
Jesse McConnell bf3c5c7922 add in some handshake state tracking into IOState to help track who initiated closes 2012-12-13 12:18:30 -06:00
Joakim Erdfelt 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
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
Jesse McConnell a2a5a97bfe add some methods to the ServletWebSocketRequest and rename one method 2012-12-10 12:16:06 -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
Greg Wilkins 3e151901bf jetty-9 Use public HttpField 2012-12-08 01:41:01 +11:00
Greg Wilkins a20d984d30 jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap 2012-12-08 01:41:00 +11: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
Joakim Erdfelt acaeb7663a Making sure websocket server tests validate Sec-WebSocket-Accept on response headers 2012-11-27 12:40:28 -07:00
Greg Wilkins f89909e301 jetty-9 cleaning up dependencies 2012-11-23 16:25:57 +11:00
Greg Wilkins 7737dc8c76 394854 Implemented Promise 2012-11-23 12:18:51 +11:00
Jesse McConnell fdc9428c6f [maven-release-plugin] prepare for next development iteration 2012-11-19 18:06:01 -06:00
Jesse McConnell d89b6f9b88 [maven-release-plugin] prepare release jetty-9.0.0.M3 2012-11-19 18:05:54 -06:00
Jesse McConnell a0c1d85094 Revert "jetty-9 cleaned up serverClasses to minimum"
This reverts commit 67b5caadbb.
2012-11-19 10:33:54 -06:00
Greg Wilkins 67b5caadbb jetty-9 cleaned up serverClasses to minimum 2012-11-19 17:42:52 +11:00
Greg Wilkins 97d2130a8f jetty-9 no debugging checked in 2012-11-19 15:08:53 +11:00
Greg Wilkins 4ff9bdc54d jetty-9 alternative websocket discovery 2012-11-15 21:23:43 +11:00
Joakim Erdfelt deed4e3db1 Fixing license header 2012-11-13 14:56:10 -07:00
Joakim Erdfelt d229364f9d Fixing jetty-osgi for new websocket artifacts 2012-11-13 12:50:27 -07:00
Joakim Erdfelt 169498cd9d Fixing Frame Decompress to work in Chrome 20.x 2012-11-12 20:52:54 -07:00
Joakim Erdfelt d67fdfdd85 Splitting out websocket-servlet to make it more friendly for WebAppClassloader 2012-11-12 19:42:32 -07: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 884f1a3eff New ExtensionStack to manage Extensions easier and more consistently 2012-11-12 16:02:05 -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
Greg Wilkins 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
Greg Wilkins b3274a6baa Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	VERSION.txt
2012-11-08 14:41:01 +11:00
Greg Wilkins eaf65a2902 393075 1xx 204 and 304 ignore all headers suggesting content 2012-11-08 14:37:07 +11:00
Joakim Erdfelt 09625a64e2 Adding more diagrams for javax.net.websocket layers 2012-11-07 12:01:25 -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 414f964afd Making changes to client / server from api / common 2012-11-06 16:58:49 -07:00
Joakim Erdfelt a7968c07be Rolling Extension and ExtensionConfig change into rest of websocket-common 2012-11-06 15:51:23 -07:00
Joakim Erdfelt 11ff35ccbb Adding missing @Override's 2012-11-06 15:50:27 -07:00
Joakim Erdfelt e625689a1c Using Extension interface, not AbstractExtension 2012-11-06 15:49:57 -07:00
Joakim Erdfelt b6a4e04b38 Removing RequestedExtensionConfig in favor of new ExtensionConfig class implementation in .api 2012-11-06 15:49:16 -07:00
Joakim Erdfelt 48e0cf1fb7 Consolidating duplicate functionality of ExtensionRegistry and ExtensionFactory 2012-11-06 15:48:44 -07:00
Joakim Erdfelt 3d94916790 Making ExtensionConfig an object, not an interface 2012-11-06 15:47:31 -07:00
Joakim Erdfelt 5eb5eb818f Brining over important getters for jetty Extension 2012-11-06 15:46:49 -07:00
Joakim Erdfelt 000cfe6986 Fixing UpgradeRequest / UpgradeResponse hierarchy. 2012-11-06 15:45:13 -07:00
Joakim Erdfelt 57c97505c8 Removing providedon javax.net.websocket 2012-11-06 15:42:06 -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 2e3447f6ef Making .common pass all existing tests 2012-11-05 17:57:39 -07:00
Joakim Erdfelt b37bd2b665 Exclude Continuations from Frame.Type 2012-11-05 17:57:04 -07:00
Joakim Erdfelt 053f91c8a0 Refactoring .core to .common and updating for .api 2012-11-05 17:18:44 -07:00