Commit Graph

918 Commits

Author SHA1 Message Date
Joakim Erdfelt 000657ddb5 Fixing various Parser bugs identified by test cases
+ Mask bytes were read backwards during slow parse
+ Bad continuation frame detection added
+ Bad fragmented data frame detection added
+ Correcting WebSocketFrame copy constructor and FIN bit
2012-08-02 13:02:54 -07:00
Joakim Erdfelt e2dd62a3af Trying to work out masking issue with parser 2012-08-02 10:13:07 -07:00
Joakim Erdfelt a638bbb850 Trying to work out why masking occasionally barfs 2012-08-02 09:53:13 -07:00
Greg Wilkins 0865a9cfb0 jetty-9 removed more AsyncConnection names 2012-08-02 18:10:29 +10:00
Greg Wilkins b63e09df61 jetty-9 rudimentary connectionFactory impl 2012-08-02 17:44:29 +10:00
Greg Wilkins b52930be14 jetty-9 merged Async and non-Async classes for EndPoint and Connection 2012-08-02 16:08:49 +10:00
Greg Wilkins a4da8f2323 Merge branch 'jetty-9' into jetty-9-oneconnector 2012-08-02 14:18:38 +10:00
Joakim Erdfelt a8a3bade33 Setting @Ignore on tests with issues ATM 2012-08-01 19:45:14 -07:00
Greg Wilkins 96b5c05674 jetty-9 one connector passing most tests 2012-08-02 11:51:54 +10:00
Joakim Erdfelt 3621bec43c More AB tests, and updates to Fuzzer 2012-08-01 13:11:24 -07:00
Joakim Erdfelt 07929fee88 Fleshing out more fragment tests 2012-08-01 10:46:15 -07:00
Joakim Erdfelt 7c742ee4e8 More AB tests around bad/reserved opcodes 2012-08-01 09:59:50 -07:00
Joakim Erdfelt ab89924261 Fleshing out more AB case 4 tests 2012-07-31 15:24:33 -07:00
Joakim Erdfelt a97fe106f9 Reworking OpCode from enum to static class 2012-07-31 15:15:21 -07:00
Joakim Erdfelt 9a568514a6 More AB testing, reworked for Fuzzer 2012-07-31 12:52:22 -07:00
Joakim Erdfelt 7d2d40dc2b Fixing PING vs CLOSE ordering issues with outgoing queue 2012-07-30 14:51:34 -07:00
Joakim Erdfelt 30ae8370bd Fixing BlockheadClient and reading of frames 2012-07-30 12:40:01 -07:00
Joakim Erdfelt c2aae7c517 Attempting to come to grips with proper close/disconnect/stop/cleanup 2012-07-27 13:48:34 -07:00
Joakim Erdfelt f2c86b2d00 Adding close validation to TestABCase1 2012-07-27 10:52:46 -07:00
Joakim Erdfelt 99afabdf92 Finished fleshing out TestABCase1 2012-07-27 10:24:35 -07:00
Joakim Erdfelt 47f882e6dc Fixing various things around generate/parse of windowed fragments.
+ @WebSocket annotation's policy configuraiton is now optional
+ WebSocketPolicy.clonePolicy() fixed for other fields
+ WebSocketEventDriver now has internal WebSocket POJO specific logger
  to allow for logging control of the WebSocket POJO itself in case of
  runtime exceptions.
+ WebSocketEventDriver now honors bufferSize correctly.
+ DataFrameBytes always requests windowSize from generator, allowing
  generator to determine ultimate byteBuffer utilization itself.
+ MessageInputStream / MessageReader now clears the starting buffer
+ Generator now honors windowSize correctly (even if buffer obtained
  from ByteBufferPool.acquire() is much larger
+ Parser now demasks the payload after a successful parse of the framing
+ Various testing cleanup to produce less noisy output during testing.
2012-07-27 09:41:26 -07:00
Joakim Erdfelt cbcb76eaea More spec tests from server point of view 2012-07-26 15:45:54 -07:00
Joakim Erdfelt b3db5ffc8d Fixing websocket-server tests 2012-07-25 11:49:04 -07:00
Simone Bordet d2a0cb5c50 Jetty9 - Fixed compilation problems. 2012-07-23 15:38:27 +02:00
Joakim Erdfelt 4af5a10b29 Working out bug in client parsing of lots of messages 2012-07-19 14:10:07 -07:00
Joakim Erdfelt 796e240545 Fixing aggregate message echo test 2012-07-18 13:23:07 -07:00
Joakim Erdfelt 1c77ef0723 Fixing bad generator.generate() assumptions on output bytebuffer state 2012-07-18 12:36:42 -07:00
Joakim Erdfelt 99e7b9becc Fixing mid-message ping/pong support 2012-07-17 11:50:53 -07:00
Joakim Erdfelt 4aa54d244a Working out some fallout of the Session split 2012-07-17 11:20:18 -07:00
Joakim Erdfelt 249595882c Wiring up extension chain on server side 2012-07-17 10:09:25 -07:00
Joakim Erdfelt 5bf71f5125 Support reponse forbidden better 2012-07-16 09:32:25 -07:00
Joakim Erdfelt b0549d8bf9 Introducing IncomingFrames and OutgoingFrames interfaces for everything to use, including Extensions 2012-07-12 11:21:35 -07:00
Joakim Erdfelt be0c372cad Moving Parser and Generator into .protocol. package 2012-07-11 11:59:03 -07:00
Joakim Erdfelt 9986f43272 Fixing license headers 2012-07-11 11:57:31 -07:00
Joakim Erdfelt 6757160a94 Starting to piece together the Extensions 2012-07-11 11:42:26 -07:00
Joakim Erdfelt 0d1fee5906 Making BlockHeadClient timeouts more sane 2012-07-11 09:53:18 -07:00
Joakim Erdfelt d3b599d67c Attempting to get timeouts working 2012-07-11 09:47:10 -07:00
Joakim Erdfelt 3ab8a0e5b7 Adding support to detect bad UTF-8 text message 2012-07-10 15:03:47 -07:00
Joakim Erdfelt 8aa6e5db9b Fixing WebSocketAsyncConnection.write() of byte[] arrays 2012-07-10 14:45:37 -07:00
Joakim Erdfelt eb07c173ca Fixing some server tests 2012-07-10 14:33:50 -07:00
Joakim Erdfelt 2f5c40bbf9 Making changes for WebSocketFrame builder 2012-07-10 13:41:50 -07:00
Joakim Erdfelt e5883607ce Adding scheduler to factory 2012-07-10 12:33:41 -07:00
Joakim Erdfelt 6a0e3f6c72 Moving old tests to new structure 2012-07-09 09:32:37 -07:00
Joakim Erdfelt c4029ba5df Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 15:53:56 -07:00
Joakim Erdfelt 7a35ea9c75 Moving more tests cases over 2012-07-06 15:53:41 -07:00
Jesse McConnell 3797508f8e switched method to add reason 2012-07-06 17:29:58 -05:00
Joakim Erdfelt 137c6c3f2e Removing ByteBufferAssert 2012-07-06 14:55:03 -07:00
Joakim Erdfelt 3e24e8290f Minor fix of logging 2012-07-06 14:52:44 -07:00
Jesse McConnell 8b6ec0194b Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 16:48:50 -05:00
Jesse McConnell b2cdc2bdb0 update test 2012-07-06 16:48:39 -05:00
Joakim Erdfelt 2af10cebab Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 14:46:16 -07:00
Joakim Erdfelt d20b277924 Fixing test case build error 2012-07-06 14:46:05 -07:00
Joakim Erdfelt 8a43e2c6fc Fixing test case build error 2012-07-06 14:45:09 -07:00
Jesse McConnell af42702a27 update test 2012-07-06 16:45:00 -05:00
Joakim Erdfelt c2872ff556 Renaming .frames.BaseFrame to .protocols.WebSocketFrame 2012-07-06 11:33:26 -07:00
Joakim Erdfelt dfc9315bc7 Next step in simplifying the frames 2012-07-06 11:32:22 -07:00
Jesse McConnell 100d1ee5d5 merge 2012-07-06 12:25:32 -05:00
Jesse McConnell 748c9b6305 core compiling but failing tests so I can work with joakim on reducing to one core frame 2012-07-06 12:23:10 -05:00
Joakim Erdfelt 70ff05e955 WebSocketAsyncConnection.write() with byte[] array fails occasionally 2012-07-06 10:22:41 -07:00
Joakim Erdfelt 84fa1163e9 Fixing write of byte buffer 2012-07-06 10:06:05 -07:00
Joakim Erdfelt ae56940796 Moving more tests to new structure 2012-07-06 09:47:11 -07:00
Joakim Erdfelt 4fadeb6b4a Reenabling message echo 2012-07-06 09:46:53 -07:00
Joakim Erdfelt 4e6a3dd2fd Making BlockheadClient a bit more friendly for debugging 2012-07-06 09:46:30 -07:00
Joakim Erdfelt 89d6e8ddbf Fixing compile issues 2012-07-06 08:49:30 -07:00
Joakim Erdfelt 4f30fe2a40 Fleshing out WebSocketPing impl 2012-07-06 08:44:56 -07:00
Joakim Erdfelt 3b2aa4c45e Moving ExtensionConfig into .protocol. package 2012-07-06 08:43:36 -07:00
Joakim Erdfelt cd46dc3cee More cleanup of websocket-server 2012-07-05 17:07:56 -07:00
Jesse McConnell 23c6c81615 move a test around, add in the basics of a frame builder and some test cases using it as an example, need to decide to complete the builder with masking or smoke it 2012-07-05 18:38:46 -05:00
Joakim Erdfelt 8fa35533b6 Moving ExtensionConfig out of .api and into .extensions where it belongs 2012-07-05 16:29:14 -07:00
Joakim Erdfelt 11280ca22d Moving packages around, cleaning up the test cases structure too 2012-07-05 16:27:45 -07:00
Greg Wilkins 05f9ba8244 jetty-9 moved connection upgrade support to HttpConnection completed 2012-07-04 14:17:41 +02:00
Joakim Erdfelt 89bd36dbaf Making fix for out of order events by moving registerWebSockets to doStart and not the constructor 2012-07-03 11:58:53 -07:00
Joakim Erdfelt 4549afbcf0 Setting SSL tests to @Ignore (till we implement the SSL bits again) 2012-07-03 11:56:27 -07:00
Joakim Erdfelt 8690348670 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-03 11:54:46 -07:00
Joakim Erdfelt d815a9c7d2 Fixing more build related issues 2012-07-03 11:53:46 -07:00
Jesse McConnell 96dc53e496 commiting ignored case til we support streaming 2012-07-03 13:44:49 -05:00
Joakim Erdfelt c97c22d6d6 Fixing compilation issues 2012-07-03 11:42:11 -07:00
Joakim Erdfelt 7d4da60d05 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-02 15:59:44 -07:00
Joakim Erdfelt f27fff4902 Initial work on websocket-client using SPDY as example 2012-07-02 15:59:35 -07:00
Jesse McConnell 46da5fe5e2 couple more test cases and fixed fragmented control frame response 2012-07-02 17:23:16 -05:00
Joakim Erdfelt 40faff2ab7 Adding TODOs from review discussion 2012-07-02 10:39:20 -07:00
Joakim Erdfelt 63ead191bf Using connector.getByteBufferPool() vs creating a new pool per WebSocketAsyncConnection 2012-07-02 08:54:42 -07:00
Joakim Erdfelt beca3f9bd0 Renaming AsyncWebSocketConnection to WebSocketAsyncConnection per discussion 2012-07-02 08:51:37 -07:00
Joakim Erdfelt 9f23e89756 Switching from websocket uri to http uri to use uri.port defaults around http specific scheme more appropriately 2012-07-02 07:23:55 -07:00
Joakim Erdfelt 990eba7ef4 Fixing javadoc 2012-07-02 07:12:31 -07:00
Joakim Erdfelt 39d8cd1b27 Overhauling CloseException to terminate the connection when encountered 2012-06-29 15:56:08 -07:00
Joakim Erdfelt 16d366e427 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-06-29 15:12:11 -07:00
Joakim Erdfelt 0a301b153e Adding ability to issue close(SERVER_ERROR) on unhandled exception during parse/notify flows 2012-06-29 15:12:05 -07:00
Jesse McConnell e86a3a400e connection cased invalid status code response tests 2012-06-29 17:10:19 -05:00
Joakim Erdfelt 3fa89ea577 Fixing buffer flip logic 2012-06-29 13:00:08 -07:00
Jesse McConnell ce90b8581b shorthand notation for g and p 2012-06-29 14:30:50 -05:00
Joakim Erdfelt e47c47f071 Fixing endpoint.fillInterested() missing piece 2012-06-29 12:11:00 -07:00
Joakim Erdfelt 9011b0713d Adding more logging 2012-06-29 12:05:15 -07:00
Joakim Erdfelt b748ff0bea Fixing src/test/resources mistakes 2012-06-29 11:56:22 -07:00
Joakim Erdfelt cd3c47ef0e Attempting to get AsyncWebSocketConnection to actually get a onFillable() call 2012-06-29 11:04:38 -07:00
Joakim Erdfelt f28324e31a Initial pass at BlockheadClient and SimpleServletServer to aid in unit testing 2012-06-29 10:08:10 -07:00
Joakim Erdfelt 9de009c1b2 Fixing failed upgrade due to invalid request websocket version 2012-06-29 09:12:59 -07:00
Joakim Erdfelt e30e5976b4 Fixing failed upgrade due to invalid request websocket version 2012-06-29 09:12:55 -07:00
Joakim Erdfelt f56b2acd8d Removing old WebSocket interface API and fixing build failures as result 2012-06-28 15:30:29 -07:00
Joakim Erdfelt d2561acde4 Fleshing out the write methods on AsyncWebSocketConnection 2012-06-28 15:07:39 -07:00
Joakim Erdfelt deef1a3ac1 First pass at WebSocketEventDriver with tests 2012-06-28 11:59:15 -07:00
Joakim Erdfelt 08796a7b37 Working EventMethod/EventMethods/EventMethodsCache with tests 2012-06-27 17:04:37 -07:00
Joakim Erdfelt 5c9a3d4bd3 API cleanup 2012-06-27 13:49:27 -07:00
Joakim Erdfelt 1e0752f5c8 More work towards API (this time on the server side) 2012-06-27 12:42:17 -07:00
Joakim Erdfelt e32249c24f Fixing old testcase as fallout from API updates 2012-06-26 16:36:38 -07:00
Joakim Erdfelt e1488f8c92 Cleaning up websocket-server module 2012-06-26 12:15:21 -07:00
Jesse McConnell 604f700a82 revert change 2012-06-26 13:52:20 -05:00
Jesse McConnell 9a9d24ecff binary tests akin to previous text frame tests 2012-06-26 13:48:25 -05:00
Joakim Erdfelt f9ef423be2 Eliminating the BufferPool management from the Generator as that's the wrong level to be managing BufferPool.release() 2012-06-26 11:10:29 -07:00
Joakim Erdfelt 79a47e7bcf Now that Connection:Upgrade response header does its thing, re-enabling test for it in websocket 2012-06-26 09:01:29 -07:00
Joakim Erdfelt 970d0764f7 Working towards a happy websocket-server connection + handshake 2012-06-25 13:48:05 -07:00
Joakim Erdfelt 1a73c74d96 Fixing generator and parser unit tests 2012-06-21 15:31:04 -07:00
Joakim Erdfelt 5a529ad4a2 Refactoring out the contents of the .api.WebSocket class in prep for rethink of original API class 2012-06-21 14:25:58 -07:00
Joakim Erdfelt dc68d30b4b Continuing refactoring of websocket-server by commenting out no longer available classes (no more red) 2012-06-21 11:11:04 -07:00
Jesse McConnell b6acc45820 maskgen -> masker + new packaging 2012-06-20 09:12:30 -05:00
Joakim Erdfelt f3532f9bd9 Moving test cases around, commenting others, we have a clean build of websocket-core now, suitable for testing 2012-06-18 14:38:49 -07:00
Joakim Erdfelt 145b98a663 Reworking BaseFrame and WebSocket api classes 2012-06-18 10:28:19 -07:00
Joakim Erdfelt 494ecbb271 Renaming module and groupId for websocket-servlet to websocket-server to better reflect nature of module 2012-06-18 09:48:33 -07:00