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
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
da2b457eaa
Fixing compile issue
2012-07-30 05:38:51 -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
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
e46cc961ac
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-25 09:16:10 -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
Simone Bordet
822abe514e
Jetty9 - Improved idle timeout handling.
...
Idle timeouts are not enforced anymore by polling the AsyncEndPoints from the SelectorManager,
but instead the AsyncEndPoints now take a SchedulerExecutorService as parameter and perform
their own enforcing of the idle timeout.
Also removed a few Timer usages (replaced by SchedulerExecutorService) and fixed XML files
referencing old APIs.
2012-07-24 10:38:28 +02: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
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
Jesse McConnell
136514948f
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:24:49 -05:00
Jesse McConnell
1bbc677a09
[maven-release-plugin] prepare release jetty-8.1.5.v20120716
2012-07-16 13:24:42 -05:00
Jesse McConnell
f755d014cd
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:23:59 -05:00
Jesse McConnell
04b7e807a0
[maven-release-plugin] prepare release jetty-7.6.5.v20120716
2012-07-16 13:23:53 -05:00
Jesse McConnell
c00bb2d6ca
reset for release
2012-07-16 12:55:22 -05:00
Jesse McConnell
f59b2a0632
reset release
2012-07-16 12:54:36 -05: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
Jesse McConnell
205e8f74f0
[maven-release-plugin] prepare for next development iteration
2012-07-13 10:20:48 -05:00
Jesse McConnell
c3b5269d60
[maven-release-plugin] prepare release jetty-8.1.5.v20120713
2012-07-13 10:20:23 -05:00
Jesse McConnell
12ecc10c6a
[maven-release-plugin] prepare for next development iteration
2012-07-13 09:35:08 -05:00
Jesse McConnell
bf40110fb8
[maven-release-plugin] prepare release jetty-7.6.5.v20120713
2012-07-13 09:34:52 -05: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
Jesse McConnell
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05: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
Jesse McConnell
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05: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
Jesse McConnell
0fa17c13b1
Merge branch 'master' into jetty-8
2012-07-11 10:10:00 -05: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