40382bad3a
jetty-9 - Removed references to JUnit 3.x.
2012-09-20 18:23:02 +02: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
e0e8708932
Updating Fuzzer for ignoring broken pipe issues when appropriate
2012-09-17 14:04:33 -07:00
0a5d32eb2f
jetty-9 - Removed unneeded 20 ms wait.
2012-09-17 21:49:19 +02:00
6e9567d410
jetty-9 - Using longer timeouts when expecting results.
2012-09-17 21:49:18 +02:00
92c95584fa
jetty-9 - Set default timeout for expect() to be 5 s.
2012-09-17 21:49:18 +02:00
dc2a13602e
Renaming DeflateFrameExtension in response to spec name change
2012-09-17 11:26:27 -07:00
129583679a
jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector
2012-09-17 17:37:56 +10:00
515804a463
Fixing connection.onOpen()
2012-09-14 15:10:54 -07:00
7ab495515a
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-09-14 14:41:09 -07:00
5ebc784b45
cleaning up test logging output
2012-09-14 14:41:03 -07:00
88cbfed7e0
jetty-9 - Made SelectorManager.connection[Opened|Closed]() concrete, since they are overridden only by SelectChannelConnector.
2012-09-14 23:30:21 +02:00
6ebd96e9bd
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-09-14 10:41:23 -07:00
c7404731c9
Starting removal of WebSocketPolicy.getBufferSize()
2012-09-14 10:41:11 -07:00
22ba57b8d2
jetty-9 refactored onOpen and onClose
2012-09-14 17:38:47 +10:00
a8994178f5
[maven-release-plugin] prepare for next development iteration
2012-09-10 14:18:11 -05:00
92180a9700
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 14:18:01 -05:00
10e4027579
[maven-release-plugin] prepare for next development iteration
2012-09-10 13:59:34 -05:00
57a6258f96
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
2012-09-10 13:59:10 -05:00
1ec8b2621b
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 13:47:05 -05:00
4180d7e1f5
prepare for release
2012-09-10 12:59:04 -05:00
3ba074ecc8
Adding .STACKS=(boolean) support to StdErrLog configuration
2012-09-06 12:33:38 -07:00
7231c82b69
Merged branch 'jetty-9' into jetty-9-client.
2012-09-06 08:41:48 +02:00
4f36513744
More work around close handshake testing
2012-09-04 14:53:34 -07:00
d37deeea74
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:18 -05:00
b418b0dd57
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:16 -05:00
41e9b1f6e2
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
2012-09-03 13:33:10 -05:00
6c0b0af2fe
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
2012-09-03 13:33:08 -05:00
c3776764f4
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:24:36 +10:00
83dbca6553
jetty-9 reworked the schedulers
2012-08-31 13:22:58 +10:00
4de5b0ad63
Merged branch 'jetty-9' into jetty-9-client.
2012-08-30 17:24:49 +02:00
353978726b
jetty-9 reverted isHead change
2012-08-27 11:14:19 +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
72bfacd5a4
Merge branch 'jetty-9' into jetty-9-aggregation
2012-08-24 20:17:08 +10:00
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
afbaa78e66
Marking client tests appropriately
2012-08-23 16:12:17 -07:00
28ae24fc35
Fixing testBlockReceiving
2012-08-22 11:06:57 -07:00
dc140f85b7
Jetty9 - Refactored HttpChannel: moved connection logic back to HttpConnection.
2012-08-21 15:09:54 +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
6311976e86
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-17 13:48:22 -07:00
b36b41afd7
Fixing websocket-client upgrade connection -> websocket connection handling
2012-08-17 13:48:04 -07:00
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
9c63ed975e
Reworking client connection handling per discussion with simone
2012-08-14 09:44:21 -07:00
1f78fc6250
Attempting to get client connection working
2012-08-13 13:59:46 -07:00
136f7924fd
Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle.
2012-08-10 19:02:16 +02: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
1a62c5ded6
Fixing websocket example to use creator
2012-08-08 08:31:44 -07:00
9c9668b112
ported websocketchat to new API
2012-08-08 16:08:47 +10: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
365f4d8448
Adding TestABCase9 with @Stress enabled
2012-08-06 13:55:55 -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
33270eced5
More valid UTF8 text payload edge cases
2012-08-03 12:49:03 -07:00
a6d88f0d0f
Adding more Invalid UTF8 text payload tests
2012-08-03 12:35:16 -07:00
951b669ba9
Adding more UTF8 text payload tests
2012-08-03 12:00:10 -07:00
744bd20a44
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-03 09:37:58 -07:00
e3132d41d8
Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
...
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 18:35:34 +02: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
962a0d0889
jetty-9 ensure injected threadpool is managed
2012-08-03 08:44:49 +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
b63e09df61
jetty-9 rudimentary connectionFactory impl
2012-08-02 17:44:29 +10:00
b52930be14
jetty-9 merged Async and non-Async classes for EndPoint and Connection
2012-08-02 16:08:49 +10:00
a4da8f2323
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-08-02 14:18:38 +10:00
a8a3bade33
Setting @Ignore on tests with issues ATM
2012-08-01 19:45:14 -07:00
96b5c05674
jetty-9 one connector passing most tests
2012-08-02 11:51:54 +10:00
3621bec43c
More AB tests, and updates to Fuzzer
2012-08-01 13:11:24 -07:00
07929fee88
Fleshing out more fragment tests
2012-08-01 10:46:15 -07:00
7c742ee4e8
More AB tests around bad/reserved opcodes
2012-08-01 09:59:50 -07:00
ab89924261
Fleshing out more AB case 4 tests
2012-07-31 15:24:33 -07: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
30ae8370bd
Fixing BlockheadClient and reading of frames
2012-07-30 12:40:01 -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
da2b457eaa
Fixing compile issue
2012-07-30 05:38:51 -07:00
c2aae7c517
Attempting to come to grips with proper close/disconnect/stop/cleanup
2012-07-27 13:48:34 -07:00
f2c86b2d00
Adding close validation to TestABCase1
2012-07-27 10:52:46 -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
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
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
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
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
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
6aba6d1e8c
Jetty9 - Refactored SelectorManager and SelectChannelEndPoint.
...
Simplified Selectable interface, and improved idle timeout checking.
2012-07-20 13:04:28 +02:00
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
4af5a10b29
Working out bug in client parsing of lots of messages
2012-07-19 14:10:07 -07:00
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
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
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
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
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
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
136514948f
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:24:49 -05:00
1bbc677a09
[maven-release-plugin] prepare release jetty-8.1.5.v20120716
2012-07-16 13:24:42 -05:00
f755d014cd
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:23:59 -05:00
04b7e807a0
[maven-release-plugin] prepare release jetty-7.6.5.v20120716
2012-07-16 13:23:53 -05:00
c00bb2d6ca
reset for release
2012-07-16 12:55:22 -05:00
f59b2a0632
reset release
2012-07-16 12:54:36 -05: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
205e8f74f0
[maven-release-plugin] prepare for next development iteration
2012-07-13 10:20:48 -05:00
c3b5269d60
[maven-release-plugin] prepare release jetty-8.1.5.v20120713
2012-07-13 10:20:23 -05:00
12ecc10c6a
[maven-release-plugin] prepare for next development iteration
2012-07-13 09:35:08 -05:00
bf40110fb8
[maven-release-plugin] prepare release jetty-7.6.5.v20120713
2012-07-13 09:34:52 -05: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
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05: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
9986f43272
Fixing license headers
2012-07-11 11:57:31 -07:00
d3a7ddbef0
Fixing license headers
2012-07-11 11:53:19 -07:00
d7f3bbb260
Fixing build issue
2012-07-11 11:43:12 -07:00
6757160a94
Starting to piece together the Extensions
2012-07-11 11:42:26 -07:00
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05:00
0d1fee5906
Making BlockHeadClient timeouts more sane
2012-07-11 09:53:18 -07:00
d3b599d67c
Attempting to get timeouts working
2012-07-11 09:47:10 -07:00
c8821605fe
Fixing fill interested
2012-07-11 09:33:58 -07:00
0fa17c13b1
Merge branch 'master' into jetty-8
2012-07-11 10:10:00 -05: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
1f25e9cee1
Setting client tests to @Ignore
2012-07-10 14:03:11 -07:00
23ecb2e29c
Fixing build
2012-07-10 13:44:09 -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
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
bc4086491b
merge frame parser and actual parser
2012-07-10 15:35:51 -05:00
e5883607ce
Adding scheduler to factory
2012-07-10 12:33:41 -07: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
6a0e3f6c72
Moving old tests to new structure
2012-07-09 09:32:37 -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
3797508f8e
switched method to add reason
2012-07-06 17:29:58 -05:00
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
889a471420
rejigger frame builder to use the generator and pull generator validation logic into assertFrameValid method
2012-07-06 17:25:58 -05:00
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
27b05ccd6e
fix protocol exception regarding control frames and FIN=false
2012-07-06 17:09:05 -05:00
87ca4eb25b
Fixing build issues
2012-07-06 15:09:03 -07:00
c24b7d83e6
Fixing close handling
2012-07-06 15:03:07 -07:00
137c6c3f2e
Removing ByteBufferAssert
2012-07-06 14:55:03 -07:00
3e24e8290f
Minor fix of logging
2012-07-06 14:52:44 -07:00
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
b2cdc2bdb0
update test
2012-07-06 16:48:39 -05:00
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
d20b277924
Fixing test case build error
2012-07-06 14:46:05 -07:00
8a43e2c6fc
Fixing test case build error
2012-07-06 14:45:09 -07:00
3bebb2e0a4
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-06 16:45:05 -05:00
af42702a27
update test
2012-07-06 16:45:00 -05: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
557de7b708
Fixing more tests
2012-07-06 13:16:21 -07:00
Simone Bordet
Joakim Erdfelt
Greg Wilkins
Jesse McConnell