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
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
889a471420
rejigger frame builder to use the generator and pull generator validation logic into assertFrameValid method
2012-07-06 17:25:58 -05:00
Jesse McConnell
27b05ccd6e
fix protocol exception regarding control frames and FIN=false
2012-07-06 17:09:05 -05:00
Joakim Erdfelt
c24b7d83e6
Fixing close handling
2012-07-06 15:03:07 -07:00
Joakim Erdfelt
cd27d7bf29
Removing CloseUtil in favor of CloseInfo
2012-07-06 14:37:57 -07:00
Joakim Erdfelt
cefeab8a65
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 14:36:14 -07:00
Joakim Erdfelt
f52c28f128
Fixing last of the test failures
2012-07-06 14:35:46 -07:00
Jesse McConnell
44f0253bdb
add warning to frame builder
2012-07-06 16:33:14 -05:00
Joakim Erdfelt
f21f0433e0
Fixing AB2.5
2012-07-06 14:23:39 -07:00
Joakim Erdfelt
e29b372604
Trying to fix AB2.5
2012-07-06 14:15:50 -07:00
Joakim Erdfelt
48a8077723
Fixing large frame test
2012-07-06 14:07:05 -07:00
Joakim Erdfelt
1a55c2fa44
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 14:06:08 -07:00
Joakim Erdfelt
f1be381866
Fixing policy
2012-07-06 14:05:58 -07:00
Jesse McConnell
7f102e7204
fixed test
2012-07-06 16:03:48 -05:00
Joakim Erdfelt
2f3937687d
Fixing EMPTY payload parsing issue
2012-07-06 14:01:35 -07:00
Jesse McConnell
fc8198e854
fixing a test issue
2012-07-06 15:56:04 -05:00
Jesse McConnell
c7cff443be
fixing a test issue
2012-07-06 15:55:09 -05:00
Joakim Erdfelt
b39a6a6f59
Fixing more tests
2012-07-06 13:49:47 -07:00
Joakim Erdfelt
071f15e0c9
Fixing tests
2012-07-06 13:43:42 -07:00
Joakim Erdfelt
cbfe922fe1
Fixing build errors
2012-07-06 13:40:23 -07:00
Joakim Erdfelt
a5424e65e3
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 13:37:25 -07:00
Joakim Erdfelt
eb9a6ecbfb
Fixing more parser tests
2012-07-06 13:37:11 -07:00
Jesse McConnell
c814772fc0
reorder tests
2012-07-06 15:33:39 -05:00
Jesse McConnell
eed8db7340
updates to unit tests
2012-07-06 15:28:46 -05:00
Joakim Erdfelt
8d0d3adcf9
Fixing FrameBuilder (and test)
2012-07-06 13:25:55 -07:00
Joakim Erdfelt
97cf0e37a9
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 13:21:15 -07:00
Joakim Erdfelt
557de7b708
Fixing more tests
2012-07-06 13:16:21 -07:00
Jesse McConnell
285701f98e
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 15:16:19 -05:00
Jesse McConnell
5973335f28
frame builder length test
2012-07-06 15:15:59 -05:00
Joakim Erdfelt
6e2c45fa47
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 13:08:11 -07:00
Joakim Erdfelt
4d020de810
Fixing parser
2012-07-06 13:07:58 -07:00
Jesse McConnell
79a1de1ad9
udpated binary tests
2012-07-06 14:41:49 -05:00
Jesse McConnell
854e056772
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 14:11:44 -05:00
Jesse McConnell
85982199e7
parsing tests showing issue
2012-07-06 14:11:33 -05:00
Joakim Erdfelt
3c8206e6bf
Adding CloseInfo (to replace CloseUtil)
2012-07-06 12:11:27 -07:00
Joakim Erdfelt
c1f4dbbfec
Replacing WebSocketFrame.ByteBuffer with byte[] array
2012-07-06 11:58:45 -07: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
Joakim Erdfelt
b515e845cc
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 11:01:33 -07:00
Jesse McConnell
3bd5ad1746
adding close util
2012-07-06 13:00:20 -05:00
Joakim Erdfelt
521e9371a6
Removing javadoc links to frame classes (being removed)
2012-07-06 10:55:53 -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
2fca248352
Fixing clearToFill bug
2012-07-06 09:45:24 -07:00
Joakim Erdfelt
03443cd237
Making debug on generator a bit more useful
2012-07-06 09:45:13 -07:00
Joakim Erdfelt
9129130a0b
Allowing .setPayload() with byte arrays in BaseFrame
2012-07-06 09:44:49 -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
Joakim Erdfelt
fa023ebc6c
Integrating the new Frame interface
2012-07-05 16:14:57 -07:00
Joakim Erdfelt
46452b9c7a
Adding beginnings of Streaming support in WebSocketEventDriver
2012-07-05 16:11:11 -07:00
Joakim Erdfelt
d163fb4414
Updating EventMethodsCache (and tests) for new OnWebSocketMessage annotation
2012-07-05 15:04:20 -07:00
Joakim Erdfelt
c7fcb6e694
Cleaning up Annotations
...
+ Removing @OnWebSocketText
+ Removing @OnWebSocketBinary
+ Starting to rework EventMethods + WebSocketEventDriver for new
@OnWebSocketMessage annotation
+ Updating various example/demo/test sockets for this new reality.
2012-07-05 14:02:21 -07:00
Joakim Erdfelt
502731d719
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-05 12:21:06 -07:00
Joakim Erdfelt
1529baea92
Start of refactor from dev community discussion
2012-07-05 12:20:51 -07:00
Greg Wilkins
2b4bf3ef26
jetty-9 moved connection upgrade support to HttpConnection completed
2012-07-04 14:19:38 +02:00
Greg Wilkins
05f9ba8244
jetty-9 moved connection upgrade support to HttpConnection completed
2012-07-04 14:17:41 +02:00
Joakim Erdfelt
3df516779b
Adding policy maxPayloadSize and autoFragmentSize
2012-07-03 16:13:44 -07:00
Joakim Erdfelt
d815a9c7d2
Fixing more build related issues
2012-07-03 11:53:46 -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
Jesse McConnell
2d5fa0a3bc
close short to int
2012-07-02 16:06:43 -05:00
Joakim Erdfelt
40faff2ab7
Adding TODOs from review discussion
2012-07-02 10:39:20 -07:00
Joakim Erdfelt
e60001fab8
Fixing exception expectation on testcase
2012-07-02 07:49:34 -07:00
Joakim Erdfelt
39d8cd1b27
Overhauling CloseException to terminate the connection when encountered
2012-06-29 15:56:08 -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
Joakim Erdfelt
3fa89ea577
Fixing buffer flip logic
2012-06-29 13:00:08 -07:00
Jesse McConnell
1899a938d0
some generator debug logging
2012-06-29 14:26:33 -05:00
Joakim Erdfelt
9011b0713d
Adding more logging
2012-06-29 12:05:15 -07:00
Joakim Erdfelt
564e56b223
Merge
2012-06-29 11:57:11 -07:00
Joakim Erdfelt
b748ff0bea
Fixing src/test/resources mistakes
2012-06-29 11:56:22 -07:00
Jesse McConnell
81372c2b7d
cleaner generator toString()
2012-06-29 13:55:36 -05:00
Joakim Erdfelt
1a56a63045
Fixing src/test/resources mistakes
2012-06-29 11:37:07 -07:00
Joakim Erdfelt
042dc41998
Making construction of TextFrame start with FIN=true
2012-06-29 11:29:03 -07:00
Joakim Erdfelt
57acc891ac
Removing Debug class in favor of just using src/test/java/jetty-logging.properties
2012-06-29 09:09:14 -07:00
Jesse McConnell
9b2aee45ad
removing tests that in hindsight ought to be connection level and not parser/generator level
2012-06-29 08:13:59 -05:00
Jesse McConnell
acabb0a2da
additional close frame testing
2012-06-29 07:51:19 -05:00
Joakim Erdfelt
54399545b1
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-06-28 15:30:46 -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
256dec3e91
Adding more test cases for WebSocketEventDriver
2012-06-28 14:41:57 -07:00
Jesse McConnell
b01c3fb595
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-06-28 16:33:01 -05:00