5fb55086d4
last of the generator examples from spec
2012-06-25 09:10:12 -05:00
8010c680e0
Early iteration of new API
2012-06-22 14:49:22 -07:00
ce9e7b7560
Fixing framing issues on gen
2012-06-22 14:07:36 -07:00
4df532a211
couple more tests and an issue exposed in frame handler
2012-06-22 15:55:08 -05:00
853905a7c0
Collaborating with Jesse on WebSocket API
2012-06-22 06:32:21 -07:00
1a73c74d96
Fixing generator and parser unit tests
2012-06-21 15:31:04 -07:00
f80024bf2b
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-06-21 14:26:07 -07:00
5a529ad4a2
Refactoring out the contents of the .api.WebSocket class in prep for rethink of original API class
2012-06-21 14:25:58 -07:00
f4a644347b
some frame consolidation work in progress
2012-06-21 16:22:17 -05:00
aaf27d7e2a
test
2012-06-21 13:13:08 -05:00
d8c12b5813
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-06-21 13:11:27 -05:00
dc68d30b4b
Continuing refactoring of websocket-server by commenting out no longer available classes (no more red)
2012-06-21 11:11:04 -07:00
ec51481c02
Adding Generator to Parser roundtrip test cases (refactored from old codebase)
2012-06-21 11:05:20 -07:00
8e21e14c6d
Minor documentation updates
2012-06-21 11:04:44 -07:00
37249d09db
Adding TEXT & BINARY to root generator map
2012-06-21 11:04:13 -07:00
dd668f7d8a
Adding TextFrame(String) constructor
2012-06-21 11:03:51 -07:00
b3a26517db
WebSocketPolicy new fields and documentation updates
2012-06-21 11:03:30 -07:00
a73d057578
ironing out generator issues at the byte lvl, so nice bit of progress
2012-06-20 18:42:24 -05:00
5f5d613eba
Removing old testcase (has replacements using new parser framework)
2012-06-20 14:44:12 -07:00
4757a1a3ee
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-06-20 14:43:26 -07:00
1692b4f7c2
Adding ClosePayloadParser & Tests
2012-06-20 14:43:16 -07:00
8893b9c96a
add text and binary frame generators
2012-06-20 16:34:45 -05:00
b61a58ad64
Adding policy violation testcase for parsing too large text frames
2012-06-20 14:19:55 -07:00
085127c8f8
Integrating new policy changes
2012-06-20 14:08:47 -07:00
2e6c307adc
Refactoring WebSocketSettings to WebSocketPolicy to better conform to naming in use within RFC 6455 spec (discussed with jesse over phone)
2012-06-20 13:48:12 -07:00
d675be84ba
Adding more testcases for Text Frames (and bug fixes)
2012-06-20 13:39:17 -07:00
ad6eee39d6
Minor formatting update
2012-06-20 11:30:04 -07:00
bec39bc953
Removing debug logigng from tests
2012-06-20 11:29:58 -07:00
4fd00431d5
Finished Parsing of RFC 6455 examples
2012-06-20 11:13:21 -07:00
917b84c454
working mask generator unit test
2012-06-20 09:56:59 -05:00
75c99dbaff
remove unneeded file
2012-06-20 09:30:57 -05:00
b6acc45820
maskgen -> masker + new packaging
2012-06-20 09:12:30 -05:00
c0d92cebd7
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-06-19 17:27:14 -05:00
a718d30a67
gettings settings down into generator, not sure this is right for masking or not yet
2012-06-19 17:27:02 -05:00
2c26326998
gettings settings down into generator, not sure this is right for masking or not yet
2012-06-19 17:26:17 -05:00
8bab5beb2b
Cleanup around FrameParser.copyBuffer()
2012-06-19 15:17:14 -07:00
dcfa524211
Working TextFrame parsing (with masking)
2012-06-19 15:03:43 -07:00
763b0b500d
Adding ByteBufferAssert.assertEquals(String,ByteBuffer,ByteBuffer)
2012-06-19 14:43:42 -07:00
8065d04a0d
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-06-19 14:38:15 -07:00
03a1b68f38
Adding ByteBufferAssert to aide in testing
2012-06-19 14:38:02 -07:00
8e1645f06b
put framing butting in new buffer
2012-06-19 16:27:53 -05:00
30901917eb
Reworking Generator (with jesse on a hangout)
2012-06-19 14:05:47 -07:00
228565068f
Fixing method names to be consistent
2012-06-19 13:10:39 -07:00
6bbeba9f59
Fixing PingPayloadParser with new FrameParser.copyBuffer() method
2012-06-19 13:07:57 -07:00
17a7b12df1
Eliminating BaseFrame copy constructors and methods, fixing PongFrame(PingFrame) constructor
2012-06-19 12:28:51 -07:00
9178bce643
Adding WebSocketSettings, integrating into Parser
2012-06-19 12:23:46 -07:00
114ff6878b
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-06-19 11:14:05 -07:00
c1f3ad8d0e
Cleaning up parsing layer to be less finicky
2012-06-19 11:13:54 -07:00
289fb7c395
move payload into control frame, not doing close frame's reason and status code since we can
...
't create bytebuffers in the frames atm
2012-06-19 13:12:53 -05:00
993c3788b9
Fixing up PongFrame to match PingFrame
2012-06-19 10:22:39 -07:00
236bcb2b86
Adding RFC6455 parsing examples
2012-06-19 10:22:14 -07:00
7227a86254
Initial pass at testing
2012-06-18 15:41:38 -07:00
f3532f9bd9
Moving test cases around, commenting others, we have a clean build of websocket-core now, suitable for testing
2012-06-18 14:38:49 -07:00
3fa8a6ad3e
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-06-18 14:34:36 -07:00
0866a75ce6
Making src/main/java error free (for build reasons)
2012-06-18 14:34:21 -07:00
d8893b4823
add simple test example
2012-06-18 16:30:19 -05:00
a4a5108da4
Merge fixes
2012-06-18 14:27:24 -07:00
cb6968d680
Introduction PayloadParser and OpCodes
2012-06-18 14:24:24 -07:00
2562dc838b
ping and close generators akin what we are looking at (atm at least)
2012-06-18 16:06:46 -05:00
b9ca387d53
Cleaning up 'frames' package
2012-06-18 13:42:47 -07:00
b696915b29
minor structural updates with joakim's latest
2012-06-18 14:03:25 -05:00
6679c9436e
minor structural updates with joakim's latest
2012-06-18 14:03:22 -05:00
541ce89c5b
Updates to BaseFrame and Parsers
2012-06-18 11:59:51 -07:00
c6802c75c8
add empty header placeholder
2012-06-18 13:10:39 -05:00
f4a416586e
add ping, pong, close frames extending from a controlframe
2012-06-18 13:02:27 -05:00
145b98a663
Reworking BaseFrame and WebSocket api classes
2012-06-18 10:28:19 -07:00
1264f1aacc
set baseframe as default type for interim
2012-06-18 12:10:04 -05:00
e768c37e50
Establishing BaseFrame
2012-06-18 10:08:10 -07:00
494ecbb271
Renaming module and groupId for websocket-servlet to websocket-server to better reflect nature of module
2012-06-18 09:48:33 -07:00
4c18bd5f45
Moving WebSocketHandler out of websocket-core into websocket-servlet
2012-06-18 09:37:07 -07:00
6d09fb70fd
Moving MaskGen into org.eclipse.jetty.websocket.generator package space
2012-06-12 13:57:12 -07:00
c7b2297216
Moving classes around, stubbing out new classes for jetty-9 refactor
2012-06-12 13:15:40 -07:00
d52de82a80
Splitting up websocket module into core/client/servlet modules
2012-06-12 12:43:29 -07:00
0b56e3ae7c
jetty-9 starting to cleanup websocket and client
2012-06-07 14:11:40 +02:00
03525bfe46
jetty-9 javadoc and code cleanups
2012-03-08 15:18:17 +11:00
824509b0fb
jetty-9 removed plurals from enum type names
2012-02-10 00:42:44 +11:00
c1bcec61d5
jetty-9 jetty-io mostly working with all NIO buffers. Occassional failure in SSL stress test
2012-02-07 11:32:00 +11:00
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
fdaad62b63
Migrating old javax.* deps to new org.eclipse.jetty.orbit deps
...
+ Removed old deps in javax.*, geronimo, and asm in favor of
new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.
2012-01-31 15:21:58 -07:00
6e44f4db5f
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:15:45 -06:00
9d1ca3593e
[maven-release-plugin] prepare release jetty-8.1.0.v20120127
2012-01-27 08:15:38 -06:00
ad6126553b
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:13:06 -06:00
4e25f7bb05
[maven-release-plugin] prepare release jetty-7.6.0.v20120127
2012-01-27 08:13:00 -06:00
f2d0fd3cc8
revert back to 8.1.0-SNAPSHOT
2012-01-26 10:45:06 -06:00
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
e98ae91ca6
[maven-release-plugin] prepare for next development iteration
2012-01-25 11:16:11 -06:00
fb30166a7f
[maven-release-plugin] prepare release jetty-8.1.0.v20120125
2012-01-25 11:16:05 -06:00
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
ec731e691d
[maven-release-plugin] prepare for next development iteration
2012-01-20 12:28:31 -06:00
6004fd4553
[maven-release-plugin] prepare release jetty-8.1.0.RC5
2012-01-20 12:28:24 -06:00
16833ca8c9
[maven-release-plugin] prepare for next development iteration
2012-01-20 10:50:24 -06:00
dd80d7e868
[maven-release-plugin] prepare release jetty-7.6.0.RC5
2012-01-20 10:50:14 -06:00
98684397fd
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-18 14:17:41 +11:00
9ff8633554
368821 SslConnection.handle always calls wrapped Connection.handle, so state can be processed
2012-01-18 13:39:24 +11:00
b6a51f0c06
Updating testcase to indicate reason of failure (when testing on OSX)
2012-01-17 13:33:41 -07:00
b8e0258faf
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java
2012-01-12 11:01:03 +11:00
c5e3ed5afe
improved test timing
2012-01-11 16:39:03 +11:00
691efcc7ca
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-11 16:35:57 +11:00
cecfa69a13
368189 - WebSocketClientFactory should not manage external thread pool.
...
368240 - Improve AggregateLifeCycle handling of shared lifecycles
Reworked the implementation in order to follow 368240.
2012-01-10 18:10:24 +01:00
1fbec51c8a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-10 16:08:59 +11:00
27cbf0bf78
367099 - Upgrade jetty-websocket for RFC 6455 - Addendum.
...
The WebSocket parser was forgot in the renaming.
Took also the chance to remove hardcoded "D13" string in toString() methods.
2012-01-09 20:27:46 +01:00
71ea564f0b
368189 - WebSocketClientFactory should not manage external thread pool.
2012-01-09 20:15:22 +01:00
e666ed67cb
368035 - WebSocketClientFactory does not invoke super.doStop().
2012-01-06 15:41:55 +01:00
06f0498a48
Made tests more reliable by waiting for the websocket connection to be established
...
and for onOpen() to be called.
2012-01-03 12:15:51 +01:00
3141b50fa0
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-30 20:19:39 +11:00
2b54d45280
367435 improved D00 test harness
2011-12-28 13:35:44 +11:00
3a1aff9221
Using a random port for the tests.
2011-12-23 23:59:05 +01:00
9e6dcc1c11
Restored constructor that was removed, used in CometD.
2011-12-23 23:54:55 +01:00
3cda41248e
367502 - WebSocket connections should be closed when application context is stopped.
2011-12-23 23:43:02 +01:00
62f47e0617
367502 - WebSocket connections should be closed when application context is stopped.
2011-12-23 17:20:57 +01:00
ed46b71f37
Merge branch 'master' into jetty-8
2011-12-23 07:44:29 -06:00
34dc926c59
367433 added tests to investigate
2011-12-23 19:19:20 +11:00
b36425b7aa
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2011-12-22 09:52:11 +11:00
ef23bf11b8
Merged from origin/master.
2011-12-21 10:45:06 +01:00
c3643d9937
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-21 12:37:23 +11:00
2ca897c1ea
367219 - WebSocketClient.open() fails when URI uses default ports.
...
+ Fixing testcase to not fail if http://localhost/ exists.
Reworking code to not rely on existence of server to validate the
correct behavior of URI port parsing.
2011-12-20 13:01:23 -07:00
8ea22a6a4c
367219 - WebSocketClient.open() fails when URI uses default ports.
2011-12-20 18:01:45 +01:00
070a2b5759
JETTY-1463 websocket D0 parser should return progress even if no fill done
2011-12-20 14:54:50 +11:00
b67961ada3
JETTY-1463 websocket D0 parser should return progress even if no fill done
2011-12-20 12:00:48 +11:00
960407492a
Removing System.out debug
2011-12-19 13:13:57 -07:00
93ebd1dbe5
Using straight Socket as HttpURLConnection request header modifications are not reliable enough for testing purposes
2011-12-19 13:06:54 -07:00
95f763fab4
Bug 367099 - Upgrade jetty-websocket for RFC 6455
...
+ Adding new RFC declared close codes 1011 (CLOSE_SERVER_ERROR) and
1015 (CLOSE_FAILED_TLS_HANDSHAKE)
+ Adding support for responding as CLOSE_SERVER_ERROR if an unhandled
exception (similar to how HTTP error 500 works) but for exceptions
thrown out of implementations of WebSocket.
+ Adding guard to prevent use of CLOSE_FAILED_TLS_HANDSHAKE on
close control frame.
+ Adding unit test for the CLOSE_SERVER_ERROR case.
+ Adding unit test for HTTP response 400 on bad Sec-WebSocket-Version
request header value.
2011-12-19 12:29:15 -07:00
874a6502f4
Adding missing license headers.
2011-12-19 10:06:58 -07:00
6d907fa61d
Bug 367099 - Upgrade jetty-websocket for RFC 6455
...
+ Renaming *D13 classes to *RFC6455 per dicussion in jetty-dev mailing
list
2011-12-19 10:03:01 -07:00
3e05c1e59d
Merged from origin/master.
2011-12-16 21:30:45 +01:00
a88e2c5ebb
Updated toString() implementations.
2011-12-16 20:53:15 +01:00
5774c03e09
Refactoring protected fields back to private with protected methods per discussion with Simone
2011-12-15 11:07:27 -07:00
ae8c8551fc
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-14 14:07:37 -07:00
300157fb2d
more time needed for ssl test on slow machine
2011-12-14 12:01:23 -08:00
5c5f783e2b
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-14 11:42:34 -08:00
bc48eb1f5b
366730 pass the time idle to onIdleExpire
2011-12-14 11:41:32 -08:00
c8e43ede1c
Merge branch 'master' into websocket-servlet-refactor
2011-12-14 11:15:20 -07:00
6b42a1c45d
JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
...
+ Implementation of Safari WebSocket Draft-0 behavior in a unit test.
(Test fails, and is currently set as @Ignore)
2011-12-14 10:23:40 -07:00
42816041c0
JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
...
+ Adding unit test to attempt to replicate behavior (test passes)
2011-12-13 11:26:30 -07:00
bcbcbafb14
More tests for WebSocket over SSL.
2011-12-13 11:15:04 +01:00
004fa1ce1c
Bug 365973 - Websocket client on android causes many VFY errors and
...
warnings.
+ Splitting out WebSocketConnection#handshake() into new
WebSocketServletConnection interface and refactoring accordingly,
in order to remove servlet-api dep on WebSocketConnection for
appropriate websocket client use.
2011-12-12 09:02:40 -07:00
6d2ad43cc4
365932 - Produce jetty-websocket aggregate jar for android use
...
+ revert last change using maven-shade-plugin as it didn't address
the now redundant transitive dependencies present in the
jetty-websocket pom.
+ made a formal jetty-aggregate/jetty-websocket build instead.
2011-12-07 12:13:57 -07:00
6b54650046
365932 - Produce jetty-websocket aggregate jar for android use
...
+ Adding maven-shade-plugin default configuration (no bytecode
manipulation) to produce an aggregate classifier jar for
jetty-websocket use.
2011-12-07 10:17:20 -07:00
0689e05e9b
365750 - Support WebSocket over SSL, aka wss://
...
This is now implemented, using the new architecture of wrapping the connection with
SslConnection.
The only refactoring was to avoid that the HTTP handshake was sent from the
HandshakeConnection constructor, because at that point the SSL wiring is not ready yet.
Now the handshake is sent from handle(), guarded by a boolean variable to sent it once.
2011-12-06 16:25:15 +01:00
89afbdf31d
360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6
2011-12-02 17:27:26 +08:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
631b0ba1b6
[maven-release-plugin] prepare for next development iteration
2011-11-30 13:16:54 +11:00
9d3745f999
[maven-release-plugin] prepare release jetty-8.1.0.RC0
2011-11-30 13:16:41 +11:00
55d5020980
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
3b2d3e5754
websocket not supported on blocking connectors
2011-11-28 15:31:07 +11:00
ddce35a2e6
364638 SCEP does idle timestamp checking. New setCheckForIdle method controls onIdleExpired callback.
...
364921 a second onIdleExpired callback will result in close rather than a shutdown output.
2011-11-28 11:51:01 +11:00
8e913fe7c0
Fixed bug in AsyncEndPoint.hasProgressed() handling: the progressing status
...
must be remembered until a call to hasProgressed() is made.
Additional code cleanups.
2011-11-24 20:58:59 +01:00
c6103f2d53
Removed usages of ThreadDeath.
2011-11-24 20:39:04 +01:00
Jesse McConnell
Joakim Erdfelt
Greg Wilkins
Greg Wilkins
Jan Bartel
Simone Bordet
hmalphettes