1cfa277c6c
jetty-9 osgi support
2012-09-24 13:04:57 +08:00
b10a10797d
Making websocket-core have a unique package org.eclipse.jetty.websocket.core to conform to osgi requirements
2012-09-18 10:01:01 -07:00
e46617ad8a
Moving maskers from core to client, where it belongs
2012-09-17 14:38:27 -07:00
dc2a13602e
Renaming DeflateFrameExtension in response to spec name change
2012-09-17 11:26:27 -07:00
c7404731c9
Starting removal of WebSocketPolicy.getBufferSize()
2012-09-14 10:41:11 -07:00
4f36513744
More work around close handshake testing
2012-09-04 14:53:34 -07:00
83dbca6553
jetty-9 reworked the schedulers
2012-08-31 13:22:58 +10:00
cb5dd493fb
jetty-9 merged jetty-9-aggregation
2012-08-27 10:24:34 +10:00
726898ffd8
jetty-9 fixed after merged
2012-08-24 20:39:03 +10:00
171ad66962
Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 12:20:44 +02:00
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
4ed72ad585
Fixing websocket-client issues around fillInterested on physical connection
2012-08-20 15:05:47 -07:00
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
b36b41afd7
Fixing websocket-client upgrade connection -> websocket connection handling
2012-08-17 13:48:04 -07:00
b37da5a5da
Making payload fast-fail and demasking work together in peace and harmony
2012-08-09 13:17:07 -07:00
03ebcc881c
jetty-9 include more modules
2012-08-09 19:31:50 +10:00
889d20ba55
Removing throws IOException on WSConnection.close()
2012-08-08 12:42:57 -07:00
0abb7511ff
Refactoring websocket.io.RawConnection to websocket.api.BaseConnection.
...
+ Introducing BaseConnection.SuspendToken and suspend/resume logic for
working with buffer suspended read concerns.
2012-08-08 12:30:12 -07:00
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
7ebab746fe
Reworking stream vs simple message appending into single concept.
...
+ Removing StreamAppender
+ Adding MessageAppender
+ Gain fast-fail on bad UTF8 in text message
2012-08-07 12:16:53 -07:00
d76a5ce80e
Fixing testcase 7.5.1 (bad utf8 close reason) handling
2012-08-07 09:53:33 -07:00
b8fc39a53e
Adding the AB7 close test cases
2012-08-06 10:18:16 -07:00
e04bb3128c
Refactoring out the basic good/bad UTF tests from TestABCase6 into separate parameterized test cases
2012-08-06 08:36:41 -07:00
03521a9a99
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-03 08:49:53 -07:00
65cb453080
Attempting to come to terms with EofException condition
2012-08-03 08:49:48 -07:00
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
9b49e889dd
Fixing big buffer flush issue (thanks simone)
2012-08-02 15:25:18 -07:00
f6d84d9f91
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-08-03 06:33:26 +10:00
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
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
e2dd62a3af
Trying to work out masking issue with parser
2012-08-02 10:13:07 -07:00
a638bbb850
Trying to work out why masking occasionally barfs
2012-08-02 09:53:13 -07:00
0865a9cfb0
jetty-9 removed more AsyncConnection names
2012-08-02 18:10:29 +10:00
b52930be14
jetty-9 merged Async and non-Async classes for EndPoint and Connection
2012-08-02 16:08:49 +10:00
96b5c05674
jetty-9 one connector passing most tests
2012-08-02 11:51:54 +10:00
a97fe106f9
Reworking OpCode from enum to static class
2012-07-31 15:15:21 -07:00
9a568514a6
More AB testing, reworked for Fuzzer
2012-07-31 12:52:22 -07:00
7d2d40dc2b
Fixing PING vs CLOSE ordering issues with outgoing queue
2012-07-30 14:51:34 -07:00
f34d74ec84
Some logging rework/repair
2012-07-30 12:39:30 -07:00
9999db9c94
Fixing WebSocketAsyncConnection close/read logic to prevent unstoppable QTP threads
2012-07-30 09:54:45 -07:00
c2aae7c517
Attempting to come to grips with proper close/disconnect/stop/cleanup
2012-07-27 13:48:34 -07:00
99afabdf92
Finished fleshing out TestABCase1
2012-07-27 10:24:35 -07:00
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
cbcb76eaea
More spec tests from server point of view
2012-07-26 15:45:54 -07:00
db2570c2ee
380928 - Implement new websocket close code
2012-07-26 10:30:12 -07:00
b3db5ffc8d
Fixing websocket-server tests
2012-07-25 11:49:04 -07:00
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
78b16d38f5
Adding more to AllTests
2012-07-25 09:35:12 -07:00
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
36360ae1d2
Adding initial tests for FragmentExtension
2012-07-24 11:47:25 -07:00
9c4a8df8af
Adding test for deflate-frame extension receiving non-compressed frames
2012-07-23 13:56:41 -07:00
93b5d97379
Full core testing of DeflateFrameExtension
...
+ Renaming FrameParserCapture -> IncomingFramesCapture
+ Adding OutgoingFramesCapture
+ Fixing DeflateFrameExtension of small payloads
2012-07-23 13:52:08 -07:00
d2a0cb5c50
Jetty9 - Fixed compilation problems.
2012-07-23 15:38:27 +02:00
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
4af5a10b29
Working out bug in client parsing of lots of messages
2012-07-19 14:10:07 -07:00
796e240545
Fixing aggregate message echo test
2012-07-18 13:23:07 -07:00
1c77ef0723
Fixing bad generator.generate() assumptions on output bytebuffer state
2012-07-18 12:36:42 -07:00
b0e475f09c
Fixing invalid statuscode error that shouldn't be thrown on no-status code
2012-07-18 12:36:14 -07:00
fae2e0d48e
No longer need to flip output of Generator.generate()
2012-07-18 12:23:04 -07:00
f8e72803a6
Fixing expectations in unit tests
2012-07-18 12:22:16 -07:00
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
0060a32bc5
Adding test of windows generator with masking
2012-07-18 11:51:22 -07:00
58e181f463
Making Generator and WebSocketFrame collaborate to allow for windowed buffer creation
2012-07-18 11:36:30 -07:00
51e77c93f3
Adding testcase for windowed Generator
2012-07-18 09:44:55 -07:00
6350470e3f
Coming to grips with windowed write
2012-07-18 09:36:16 -07:00
c0e80e6ff9
comments on the generate() method
2012-07-18 10:54:00 -05:00
99e7b9becc
Fixing mid-message ping/pong support
2012-07-17 11:50:53 -07:00
4aa54d244a
Working out some fallout of the Session split
2012-07-17 11:20:18 -07:00
6ece593c58
Fixing expectations of internal impl now that WebSocketSession exists
2012-07-17 10:15:11 -07:00
249595882c
Wiring up extension chain on server side
2012-07-17 10:09:25 -07:00
c84df9bf2b
Adding test suite for quick testing
2012-07-16 16:08:00 -07:00
6c0e24485a
Splitting out new WebSocketSession from WebSocketAsyncConnection to better support extensions (see diagrams)
2012-07-16 15:49:12 -07:00
10eeb3f6cf
Fixing typo [1]
2012-07-16 12:04:43 -07:00
851b53ec3a
Adding diagrams to javadoc about communications stack (and extensions)
2012-07-16 11:58:27 -07:00
1381ee4eeb
Adding copy constructor
2012-07-16 09:55:00 -07:00
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
5bf71f5125
Support reponse forbidden better
2012-07-16 09:32:25 -07:00
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
e70df19248
jetty-9 progress on more unit tests
2012-07-13 22:55:40 +10:00
fc658c3805
Fixing NPE
2012-07-12 11:29:40 -07:00
b0549d8bf9
Introducing IncomingFrames and OutgoingFrames interfaces for everything to use, including Extensions
2012-07-12 11:21:35 -07:00
f4c0b376d6
Removing discouraged form of Generator constructor
2012-07-11 13:08:02 -07:00
03fa76d333
Adding more TODOs
2012-07-11 12:01:02 -07:00
be0c372cad
Moving Parser and Generator into .protocol. package
2012-07-11 11:59:03 -07:00
d3a7ddbef0
Fixing license headers
2012-07-11 11:53:19 -07:00
6757160a94
Starting to piece together the Extensions
2012-07-11 11:42:26 -07:00
c8821605fe
Fixing fill interested
2012-07-11 09:33:58 -07:00
3ab8a0e5b7
Adding support to detect bad UTF-8 text message
2012-07-10 15:03:47 -07:00
8aa6e5db9b
Fixing WebSocketAsyncConnection.write() of byte[] arrays
2012-07-10 14:45:37 -07:00
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
eb07c173ca
Fixing some server tests
2012-07-10 14:33:50 -07:00
c0b1261c2b
come back from parseFrame in order to notify
2012-07-10 16:32:57 -05:00
5d796488e2
Fixing logging format specifier bug
2012-07-10 14:07:04 -07:00
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
2f5c40bbf9
Making changes for WebSocketFrame builder
2012-07-10 13:41:50 -07:00
bc4086491b
merge frame parser and actual parser
2012-07-10 15:35:51 -05:00
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
9488507919
updated unit tests
2012-07-10 14:25:16 -05:00
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
3d39d0a916
Updating tests for WebSocketFrame
2012-07-10 12:20:40 -07:00
d358847d5e
updated unit tests
2012-07-10 14:20:26 -05:00
b3d7dd4f1b
adding constructors
2012-07-10 14:17:57 -05:00
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
ef69b22815
Fixing WebSocketFrame.setPayload(byte[]) bug, updating more tests
2012-07-10 12:16:47 -07:00
4fed53ce85
test improvement
2012-07-10 14:13:09 -05:00
b46ba628cd
Adding UnitGenerator and migrating more tests cases to WebSocketFrame
2012-07-10 12:05:03 -07:00
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
cd0edafa68
Fixing build issue
2012-07-10 11:53:10 -07:00
8c6820a812
update to use latest changes on frame
2012-07-10 13:52:27 -05:00
d6139b8978
Adding convenience statics to WebSocketFrame (useful stuff from FrameBuilder)
2012-07-10 11:48:53 -07:00
caf693488a
Removing FrameBuilder
2012-07-10 11:44:17 -07:00
c2f1d23f2b
Making WebSocketFrame use builder pattern
2012-07-10 11:12:10 -07:00
20876011e0
Working in FrameBytes queue and timeout task
2012-07-10 10:41:47 -07:00
8de2cc6805
Fixing parser
2012-07-10 10:19:38 -07:00
9d2968d781
null check on payload
2012-07-10 08:55:15 -05:00
3754f9e04c
most tests compiling again
2012-07-10 08:53:10 -05:00
dc3ad1f3d5
clean up aftereffects of byte[] -> ByteBuffer switch in WebSocketFrame internals
2012-07-10 08:33:19 -05:00
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
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
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
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
3ae9548c43
Another review refact (in progress)
2012-07-09 14:42:59 -07:00
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
7a35ea9c75
Moving more tests cases over
2012-07-06 15:53:41 -07:00
db83405218
add comments re: rfc6455 for frame generator validation
2012-07-06 17:41:54 -05:00
889a471420
rejigger frame builder to use the generator and pull generator validation logic into assertFrameValid method
2012-07-06 17:25:58 -05:00
27b05ccd6e
fix protocol exception regarding control frames and FIN=false
2012-07-06 17:09:05 -05:00
c24b7d83e6
Fixing close handling
2012-07-06 15:03:07 -07:00
cd27d7bf29
Removing CloseUtil in favor of CloseInfo
2012-07-06 14:37:57 -07:00
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
f52c28f128
Fixing last of the test failures
2012-07-06 14:35:46 -07:00
44f0253bdb
add warning to frame builder
2012-07-06 16:33:14 -05:00
f21f0433e0
Fixing AB2.5
2012-07-06 14:23:39 -07:00
e29b372604
Trying to fix AB2.5
2012-07-06 14:15:50 -07:00
48a8077723
Fixing large frame test
2012-07-06 14:07:05 -07:00
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
f1be381866
Fixing policy
2012-07-06 14:05:58 -07:00
7f102e7204
fixed test
2012-07-06 16:03:48 -05:00
2f3937687d
Fixing EMPTY payload parsing issue
2012-07-06 14:01:35 -07:00
fc8198e854
fixing a test issue
2012-07-06 15:56:04 -05:00
c7cff443be
fixing a test issue
2012-07-06 15:55:09 -05:00
b39a6a6f59
Fixing more tests
2012-07-06 13:49:47 -07:00
071f15e0c9
Fixing tests
2012-07-06 13:43:42 -07:00
cbfe922fe1
Fixing build errors
2012-07-06 13:40:23 -07:00
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
eb9a6ecbfb
Fixing more parser tests
2012-07-06 13:37:11 -07:00
c814772fc0
reorder tests
2012-07-06 15:33:39 -05:00
eed8db7340
updates to unit tests
2012-07-06 15:28:46 -05:00
8d0d3adcf9
Fixing FrameBuilder (and test)
2012-07-06 13:25:55 -07:00
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
Hugues Malphettes
Joakim Erdfelt
Greg Wilkins
Simone Bordet
Jesse McConnell