Greg Wilkins
5e6cd1b27f
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
2012-08-03 08:48:34 +10:00
Joakim Erdfelt
9b49e889dd
Fixing big buffer flush issue (thanks simone)
2012-08-02 15:25:18 -07:00
Greg Wilkins
f6d84d9f91
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-08-03 06:33:26 +10:00
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
01c40b5290
Fixing Parsing of masking bytes on slow testcase (would read in reverse order under certain conditions)
2012-08-02 10:31:37 -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
b52930be14
jetty-9 merged Async and non-Async classes for EndPoint and Connection
2012-08-02 16:08:49 +10:00
Greg Wilkins
96b5c05674
jetty-9 one connector passing most tests
2012-08-02 11:51:54 +10: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
f34d74ec84
Some logging rework/repair
2012-07-30 12:39:30 -07:00
Joakim Erdfelt
9999db9c94
Fixing WebSocketAsyncConnection close/read logic to prevent unstoppable QTP threads
2012-07-30 09:54:45 -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
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
db2570c2ee
380928 - Implement new websocket close code
2012-07-26 10:30:12 -07:00
Joakim Erdfelt
b3db5ffc8d
Fixing websocket-server tests
2012-07-25 11:49:04 -07:00
Joakim Erdfelt
6fa2f67a96
Updates for Extensions
...
+ Extensions now report to Generator their requirements for
RSV1, RSV2, RSV3
+ DeflateFrameExtension now reports RSV1 use.
+ DeflateFrameExtension reads uncompressed data properly now.
+ Unit tests for small/medium/large payloads on DeflateFrameExtension
+ OutgoingFrames.output() method now has non-optional throws IOException
2012-07-25 11:04:38 -07:00
Joakim Erdfelt
78b16d38f5
Adding more to AllTests
2012-07-25 09:35:12 -07:00
Joakim Erdfelt
a49238ceba
Removing FragmentExtension's minFragments config.
...
+ The minFragments configuration appears to work on the message,
not the fragments, so its was removed as inappropriate for the
level of the protocol the FragmentExtension works on.
2012-07-24 13:21:35 -07:00
Joakim Erdfelt
36360ae1d2
Adding initial tests for FragmentExtension
2012-07-24 11:47:25 -07:00
Joakim Erdfelt
9c4a8df8af
Adding test for deflate-frame extension receiving non-compressed frames
2012-07-23 13:56:41 -07:00
Joakim Erdfelt
93b5d97379
Full core testing of DeflateFrameExtension
...
+ Renaming FrameParserCapture -> IncomingFramesCapture
+ Adding OutgoingFramesCapture
+ Fixing DeflateFrameExtension of small payloads
2012-07-23 13:52:08 -07:00
Simone Bordet
d2a0cb5c50
Jetty9 - Fixed compilation problems.
2012-07-23 15:38:27 +02:00
Simone Bordet
6b4583b461
Jetty9 - Introduced a onReadTimeout() callback and refactored into AbstractAsyncConnection.onOpen() calls to onFillInterested() that were previously done by all subclasses.
2012-07-23 14:27:33 +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
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
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
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