Commit Graph

807 Commits

Author SHA1 Message Date
Joakim Erdfelt b5d23b1c64 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-20 07:00:17 -07:00
Simone Bordet 6aba6d1e8c Jetty9 - Refactored SelectorManager and SelectChannelEndPoint.
Simplified Selectable interface, and improved idle timeout checking.
2012-07-20 13:04:28 +02:00
Joakim Erdfelt f58182d2ab Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-19 14:10:15 -07:00
Joakim Erdfelt 4af5a10b29 Working out bug in client parsing of lots of messages 2012-07-19 14:10:07 -07:00
Simone Bordet dfeb761306 Jetty9 - Now calling SelectorManager.newConnection() from a single call site rather than having to duplicate the call in every newEndPoint() implementation. 2012-07-19 18:43:23 +02: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 b0e475f09c Fixing invalid statuscode error that shouldn't be thrown on no-status code 2012-07-18 12:36:14 -07:00
Joakim Erdfelt fae2e0d48e No longer need to flip output of Generator.generate() 2012-07-18 12:23:04 -07:00
Joakim Erdfelt f8e72803a6 Fixing expectations in unit tests 2012-07-18 12:22:16 -07:00
Jesse McConnell 960491cc64 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-18 14:01:42 -05:00
Joakim Erdfelt 964fa9325a Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-18 11:51:38 -07:00
Joakim Erdfelt 0060a32bc5 Adding test of windows generator with masking 2012-07-18 11:51:22 -07:00
Joakim Erdfelt 58e181f463 Making Generator and WebSocketFrame collaborate to allow for windowed buffer creation 2012-07-18 11:36:30 -07:00
Simone Bordet ebb7806edc Jetty9 - Implemented abstract methods on SelectorManager that were always implemented in the same way, making them consistent. 2012-07-18 19:47:10 +02:00
Joakim Erdfelt 51e77c93f3 Adding testcase for windowed Generator 2012-07-18 09:44:55 -07:00
Joakim Erdfelt 6350470e3f Coming to grips with windowed write 2012-07-18 09:36:16 -07:00
Jesse McConnell c0e80e6ff9 comments on the generate() method 2012-07-18 10:54:00 -05: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 6ece593c58 Fixing expectations of internal impl now that WebSocketSession exists 2012-07-17 10:15:11 -07:00
Joakim Erdfelt 249595882c Wiring up extension chain on server side 2012-07-17 10:09:25 -07:00
Joakim Erdfelt c84df9bf2b Adding test suite for quick testing 2012-07-16 16:08:00 -07:00
Joakim Erdfelt 6c0e24485a Splitting out new WebSocketSession from WebSocketAsyncConnection to better support extensions (see diagrams) 2012-07-16 15:49:12 -07:00
Joakim Erdfelt 10eeb3f6cf Fixing typo [1] 2012-07-16 12:04:43 -07:00
Joakim Erdfelt 851b53ec3a Adding diagrams to javadoc about communications stack (and extensions) 2012-07-16 11:58:27 -07:00
Joakim Erdfelt 1381ee4eeb Adding copy constructor 2012-07-16 09:55:00 -07:00
Joakim Erdfelt 1cf2035580 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-16 09:32:38 -07:00
Joakim Erdfelt 5bf71f5125 Support reponse forbidden better 2012-07-16 09:32:25 -07:00
Greg Wilkins acbf20af27 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
Conflicts:
	jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
2012-07-13 22:59:05 +10:00
Greg Wilkins e70df19248 jetty-9 progress on more unit tests 2012-07-13 22:55:40 +10:00
Joakim Erdfelt fc658c3805 Fixing NPE 2012-07-12 11:29:40 -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 f4c0b376d6 Removing discouraged form of Generator constructor 2012-07-11 13:08:02 -07:00
Joakim Erdfelt 03fa76d333 Adding more TODOs 2012-07-11 12:01:02 -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 d3a7ddbef0 Fixing license headers 2012-07-11 11:53:19 -07:00
Joakim Erdfelt d7f3bbb260 Fixing build issue 2012-07-11 11:43:12 -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 c8821605fe Fixing fill interested 2012-07-11 09:33:58 -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 4fd7ff76fb Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 14:34:05 -07:00
Joakim Erdfelt eb07c173ca Fixing some server tests 2012-07-10 14:33:50 -07:00
Jesse McConnell c0b1261c2b come back from parseFrame in order to notify 2012-07-10 16:32:57 -05:00
Joakim Erdfelt 5d796488e2 Fixing logging format specifier bug 2012-07-10 14:07:04 -07:00
Joakim Erdfelt 1f25e9cee1 Setting client tests to @Ignore 2012-07-10 14:03:11 -07:00
Joakim Erdfelt 23ecb2e29c Fixing build 2012-07-10 13:44:09 -07:00
Joakim Erdfelt 6f52b23735 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 13:41:56 -07:00
Joakim Erdfelt 2f5c40bbf9 Making changes for WebSocketFrame builder 2012-07-10 13:41:50 -07:00
Jesse McConnell ea68a3de83 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 15:36:09 -05:00
Jesse McConnell bc4086491b merge frame parser and actual parser 2012-07-10 15:35:51 -05:00
Joakim Erdfelt e5883607ce Adding scheduler to factory 2012-07-10 12:33:41 -07:00
Jesse McConnell 3ede05e134 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 14:25:35 -05:00
Jesse McConnell 9488507919 updated unit tests 2012-07-10 14:25:16 -05:00
Joakim Erdfelt 95e540fd27 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 12:20:50 -07:00
Joakim Erdfelt 3d39d0a916 Updating tests for WebSocketFrame 2012-07-10 12:20:40 -07:00
Jesse McConnell d358847d5e updated unit tests 2012-07-10 14:20:26 -05:00
Jesse McConnell b3d7dd4f1b adding constructors 2012-07-10 14:17:57 -05:00
Joakim Erdfelt 8d583045b3 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 12:16:58 -07:00
Joakim Erdfelt ef69b22815 Fixing WebSocketFrame.setPayload(byte[]) bug, updating more tests 2012-07-10 12:16:47 -07:00
Jesse McConnell 4fed53ce85 test improvement 2012-07-10 14:13:09 -05:00
Joakim Erdfelt b46ba628cd Adding UnitGenerator and migrating more tests cases to WebSocketFrame 2012-07-10 12:05:03 -07:00
Joakim Erdfelt f97d86894a Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-10 11:53:19 -07:00
Joakim Erdfelt cd0edafa68 Fixing build issue 2012-07-10 11:53:10 -07:00
Jesse McConnell 8c6820a812 update to use latest changes on frame 2012-07-10 13:52:27 -05:00
Joakim Erdfelt d6139b8978 Adding convenience statics to WebSocketFrame (useful stuff from FrameBuilder) 2012-07-10 11:48:53 -07:00
Joakim Erdfelt caf693488a Removing FrameBuilder 2012-07-10 11:44:17 -07:00
Joakim Erdfelt c2f1d23f2b Making WebSocketFrame use builder pattern 2012-07-10 11:12:10 -07:00
Joakim Erdfelt 20876011e0 Working in FrameBytes queue and timeout task 2012-07-10 10:41:47 -07:00
Joakim Erdfelt 8de2cc6805 Fixing parser 2012-07-10 10:19:38 -07:00
Jesse McConnell 9d2968d781 null check on payload 2012-07-10 08:55:15 -05:00
Jesse McConnell 3754f9e04c most tests compiling again 2012-07-10 08:53:10 -05:00
Jesse McConnell dc3ad1f3d5 clean up aftereffects of byte[] -> ByteBuffer switch in WebSocketFrame internals 2012-07-10 08:33:19 -05:00
Joakim Erdfelt 057acfd665 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-09 16:37:00 -07:00
Joakim Erdfelt 85b5d3456f More work to flesh out the FrameBytes concept from SPDY within the scope of WebSocket with an eye on physical vs virtual connections 2012-07-09 16:36:54 -07:00
Joakim Erdfelt 5f6d7ec596 Refactoring out the byte[] array in favor of ByteBuffer in frame (to reduce number of data copies) 2012-07-09 15:26:05 -07:00
Jesse McConnell 4a1f50c7a6 switch generator to use bytebuffer again and wire pool back in, update frame builder to use static internal pool for time being, remove FrameGenerator 2012-07-09 17:20:58 -05:00
Joakim Erdfelt 3ae9548c43 Another review refact (in progress) 2012-07-09 14:42:59 -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 db83405218 add comments re: rfc6455 for frame generator validation 2012-07-06 17:41:54 -05:00
Jesse McConnell 3797508f8e switched method to add reason 2012-07-06 17:29:58 -05:00
Jesse McConnell b4cf61bc7d Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 17:26:02 -05:00
Jesse McConnell 889a471420 rejigger frame builder to use the generator and pull generator validation logic into assertFrameValid method 2012-07-06 17:25:58 -05:00
Joakim Erdfelt 5d9eab45b4 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-07-06 15:09:27 -07:00
Jesse McConnell 27b05ccd6e fix protocol exception regarding control frames and FIN=false 2012-07-06 17:09:05 -05:00
Joakim Erdfelt 87ca4eb25b Fixing build issues 2012-07-06 15:09:03 -07:00
Joakim Erdfelt c24b7d83e6 Fixing close handling 2012-07-06 15:03:07 -07: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