Joakim Erdfelt
dc59080fca
WebSocket / Fixing pathmap matching when query parameters are provided
2013-09-11 07:24:25 -07:00
Joakim Erdfelt
aa9aea00be
Adding back missing enable check, correcting javadoc
2013-09-09 19:04:55 -07:00
Joakim Erdfelt
d3421070cb
Adding back ENABLE attribute for JSR-356
2013-09-09 19:01:23 -07:00
Joakim Erdfelt
31ff31c8b1
Undo temporary change for memory testing reasons
2013-09-09 12:23:50 -07:00
Joakim Erdfelt
aeac72a684
416812 - Don't start WebSocketClient for every context
...
+ Lazy initializing WebSocketClient connection manager
to avoid holding threads that the selector manager
will allocate.
2013-09-09 12:06:57 -07:00
Joakim Erdfelt
b1b8e2b0a1
Adding Example for javax.websocket Client use
2013-09-09 10:08:58 -07:00
Joakim Erdfelt
7e3ef36f16
Revert "416812 Only start WebSocketContainer if enabled by attribute"
...
This reverts commit a1cba900c5
.
2013-09-09 09:28:33 -07:00
Greg Wilkins
070ce9dd22
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
Mikhail Mazursky
767faece5c
[Bug 415999] Fix some of FindBugs warnings
...
Mostly not closed streams/DB resources are fixed. But also less
important things.
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Greg Wilkins
a1cba900c5
416812 Only start WebSocketContainer if enabled by attribute
2013-09-09 12:27:15 +10:00
Joakim Erdfelt
ed0f49f819
416763 - WebSocket / Jsr Session.getPathParameters() is empty
...
+ Adding support for `extends Endpoint` based endpoints as well
2013-09-06 14:35:22 -07:00
Joakim Erdfelt
fe4a778334
416764 - WebSocket / Jsr Session.getRequestURI() is missing scheme + host + port + query parameters
...
+ Relying on WebSocketSession.getRequestURI() instead.
2013-09-06 13:57:05 -07:00
Joakim Erdfelt
eeb8a51c88
416764 - WebSocket / Jsr Session.getRequestURI() is missing scheme + host + port + query parameters
...
+ Adding test cases to verify behavior.
2013-09-06 13:47:49 -07:00
Joakim Erdfelt
50d98ab527
416763 - WebSocket / Jsr Session.getPathParameters() is empty
...
+ Ensuring this works as intended with new test case
2013-09-06 13:40:49 -07:00
Joakim Erdfelt
714bbf943a
Removing @ServerEndpoint caching, its just getting in the way
2013-09-06 12:28:33 -07:00
Joakim Erdfelt
73f06c2a14
412205 - SSL handshake failure leads to unresponsive UpgradeConnection
...
+ Passing failure() back out of the UpgradeConnection
2013-09-03 13:15:04 -07:00
Jesse McConnell
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
Greg Wilkins
b884fabba6
Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
2013-08-29 12:38:53 +10:00
Joakim Erdfelt
be2385276f
WebSocket / Fixing support for permessage-deflate extension
2013-08-28 11:49:54 -07:00
Greg Wilkins
e5b4f37b62
renamed README.txt to README.TXT and updated contents
2013-08-29 00:32:36 +10:00
Joakim Erdfelt
20fbd95bf1
395444 - Websockets not working with Chrome (deflate problem)
...
+ Hopefully final fix to deflate-frame
+ Splitting out extension named 'deflate-frame' (last spec'd standard) from
'x-webkit-deflate-frame' (standard in use by chrome + safari)
2013-08-27 14:20:07 -07:00
Joakim Erdfelt
e36ce2743e
414635 Modular start.d and jetty.base property
...
+ More *.mod definition updates
+ Some safety checks in Module edge addition to prevent duplicates
+ Minor updates to README in jetty-start
2013-08-23 15:47:50 -07:00
Joakim Erdfelt
2e94149ea3
Merge branch 'jetty-9.1' into jetty-9.1-altstart
2013-08-23 11:49:41 -07:00
Joakim Erdfelt
098b1e174b
WebSocket - making flush loop and callback notify more consistent
2013-08-23 10:57:05 -07:00
Greg Wilkins
bddf536caa
fixed header
2013-08-23 20:07:05 +10:00
Greg Wilkins
e4235ea070
415744 - Reduce Future usage in websocket
2013-08-23 19:58:46 +10:00
Greg Wilkins
a6b6891d8b
415641 Remove remaining calls to deprecated HttpTranspoert.send
...
Actually removed the impl of the deprecated method that is no longer called.
2013-08-23 10:23:52 +10:00
Jesse McConnell
0032c1443d
add spdy and websocket mod
2013-08-22 13:23:29 -05:00
Joakim Erdfelt
00e5daa37e
Adding some WebSocket examples
2013-08-21 11:13:45 -07:00
Joakim Erdfelt
4d9cb44536
WebSocket - Calling setPayload() outside of ContinuationFrame
2013-08-20 16:51:11 -07:00
Joakim Erdfelt
e56fddfc4a
WebSocket - Calling setPayload() outside of TextFrame and BinaryFrame
2013-08-20 16:45:26 -07:00
Joakim Erdfelt
a089780701
WebSocket - Calling setPayload() outside of PingFrame and PongFrame
2013-08-20 16:39:26 -07:00
Joakim Erdfelt
975d9870d2
WebSocket - more code cleanup
2013-08-20 16:28:51 -07:00
Joakim Erdfelt
c6a4af4f78
WebSocket - cleaning up frame initialization and use
2013-08-20 15:45:07 -07:00
Joakim Erdfelt
8c77fe2404
WebSocket - addressing bug in Partial message support
2013-08-20 15:31:12 -07:00
Joakim Erdfelt
c548cba71c
WebSocket - fixing windowed parse issue with masked frames
2013-08-20 12:56:32 -07:00
Joakim Erdfelt
34f03cb0e8
WebSocket / releasing (header) buffer acquired during generation
2013-08-20 09:57:57 -07:00
Joakim Erdfelt
8e66da396e
Merge branch 'jetty-9.1-wssplitframe' into jetty-9.1
2013-08-19 15:27:09 -07:00
Joakim Erdfelt
3dbcc04b73
Breaking apart WebSocketFrame into sub-frame types
...
+ Performance improvements?
+ Less copying of data
2013-08-19 15:26:07 -07:00
Simone Bordet
45724b63ec
Improved masking performance by using ints instead of bytes.
2013-08-19 22:11:52 +02:00
Simone Bordet
1c73ce674f
Using direct buffers for reads, to avoid copy of the bytes by the
...
JDK, and because they yield better performance for masking.
2013-08-19 22:11:40 +02:00
Joakim Erdfelt
26faa5f0d7
WebSocket - fixing flush->write->complete spinning loop
2013-08-16 13:08:10 -07:00
Joakim Erdfelt
4016ba571c
JSR-356 working javax.websocket demo in the distribution.
2013-08-15 12:20:06 -07:00
Jan Bartel
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
Jan Bartel
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
Jan Bartel
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
Jan Bartel
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
Jan Bartel
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
Jesse McConnell
00d160a1c9
Merge branch 'release-9.1' into jetty-9.1
2013-08-14 14:37:19 -05:00
Joakim Erdfelt
6daf39b10b
Fixing javadoc generation in jetty-all
...
+ Added missing javax artifacts to jetty-all pom
+ Moved javax.websocket versioning to top level pom
2013-08-14 12:14:47 -07:00
Jesse McConnell
657e78aff2
[maven-release-plugin] prepare for next development iteration
2013-08-14 13:28:42 -05:00
Jesse McConnell
590fae2bc4
[maven-release-plugin] prepare release jetty-9.1.0.M0
2013-08-14 13:28:32 -05:00
Joakim Erdfelt
e39b48c90d
Fixing up javadoc issues in WebSocket classes
2013-08-14 10:54:07 -07:00
Jesse McConnell
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
Jesse McConnell
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
Joakim Erdfelt
980effaede
WebSocket - reducing memory footprint of WebSocketFrame by not using boolean fields
2013-08-13 12:09:43 -07:00
Joakim Erdfelt
176c7d22e4
JSR-356 - adding missing base Encoders
2013-08-13 12:09:43 -07:00
Joakim Erdfelt
1e39b7d476
WebSocket / Performance - cleaning up tests from fallout on bug 414913
...
+ Copying payload in test cases for comparison reasons, as the reuse of
payloads by the implementation now means that the payload might be
masked by a random client side mask.
+ Cleaning up Abnormal Close handling for idle timeout cases
+ Fixing logging a tag
+ Fixing intermittent test failure in jsr EchoTest
2013-08-12 16:29:25 -07:00
Joakim Erdfelt
46b3dc10c8
414913 - WebSocket / Performance - reduce ByteBuffer allocation/copying during generation/writing
...
+ Splitting Header bytes from payload bytes.
+ returning List<ByteBuffer> from WriteBytesProvider now
+ returning possibly more than 1 frame per
WriteBytesProvider.getByteBuffers() for submission to
Endpoint.write()'s gathered write of multiple bytebuffers
2013-08-12 16:29:25 -07:00
Joakim Erdfelt
d3d4f7abed
WebSocket - quick fix to prevent jenkins test hang
2013-08-08 09:46:31 -07:00
Joakim Erdfelt
5500f161d7
WebSocket - refining javadoc
2013-08-08 09:46:16 -07:00
Joakim Erdfelt
baeda84402
WebSocket - fixing Frame.getPayloadLength()
2013-08-08 09:45:46 -07:00
Joakim Erdfelt
eb0d7da7f2
JSR-356 Making PongMessage work with @OnMessage annotation
2013-08-06 13:15:13 -07:00
Joakim Erdfelt
3e070f929e
JSR-356 addMessageHandler with Reader or InputStream should not NPE
2013-08-06 12:55:02 -07:00
Joakim Erdfelt
12f6853900
WebSocket - enabling WebSocket on distribution
2013-08-06 09:20:02 -07:00
Joakim Erdfelt
2354ad4c3d
Cleaning up javadoc
2013-08-06 09:19:49 -07:00
Joakim Erdfelt
dfd3d5af29
WebSocket - refactoring bits and pieces to make testing easier.
2013-08-02 09:33:15 -07:00
Simone Bordet
ed95ffbfea
Fixed lifecycle management.
2013-08-02 15:05:50 +02:00
Joakim Erdfelt
89b33f5b88
WebSocket - fixing message (buffer) size settings and checks
2013-08-01 16:06:44 -07:00
Joakim Erdfelt
833aa6723d
WebSocket - More concurrency fixes found by FindBugs
2013-08-01 13:51:18 -07:00
Joakim Erdfelt
07041f6439
JSR-356 making HTTP Header map use TreeMap(String.CASE_INSENSITIVE_ORDER)
2013-08-01 10:50:01 -07:00
Joakim Erdfelt
cbaf68be20
Fixing license headers
2013-08-01 07:48:03 -07:00
Joakim Erdfelt
11bb7431d2
JSR-356 some more tests
2013-08-01 07:47:14 -07:00
Joakim Erdfelt
441c98544a
JSR-356 if mapping not found, allow default behavior
2013-08-01 07:47:02 -07:00
Joakim Erdfelt
589b03d64c
Adding example on how to get the HttpSession into your socket.
2013-08-01 06:11:01 -07:00
Joakim Erdfelt
e2f02a7a8a
JSR-356 fixing ServerContainer.setDefault*() method behavior
2013-07-31 14:25:54 -07:00
Joakim Erdfelt
eb9fce2fa5
JSR-356: fixing Session.getProtocolVersion()
2013-07-31 13:41:46 -07:00
Joakim Erdfelt
0444b87961
414167 - WebSocket handshake upgrade from FireFox fails due to keep-alive
...
+ Making .isUpgradeRequest() multi-value aware, per spec
2013-07-31 13:00:16 -07:00
Joakim Erdfelt
9846aee917
JSR-356 returning empty string (per javadoc) instead of null for Session.getNegotiatedSubprotocol()
2013-07-31 11:42:42 -07:00
Joakim Erdfelt
153c844238
Adding Shutdown hook to ClientContainer
2013-07-31 10:48:23 -07:00
Joakim Erdfelt
0fd0ecc887
JSR-356 - making ClientContainer a use jetty LifeCycle properly
2013-07-31 10:34:31 -07:00
Joakim Erdfelt
8a2ccdf8ae
JSR-356 - fixing Session.setMax(Text|Binary)MessageBufferSize
2013-07-31 09:52:51 -07:00
Joakim Erdfelt
0833d66dc6
JSR-356 - unwrapping connect exceptions better
2013-07-31 08:15:32 -07:00
Joakim Erdfelt
9ebf890d51
WebSocket - supporting WriteCallback in jetty RemoteEndpoint
...
+ new RemoteEndpoint.sendBytes(ByteBuffer, WriteCallback)
+ new RemoteEndpoint.sendString(String, WriteCallback)
2013-07-30 15:25:41 -07:00
Joakim Erdfelt
28b3ee8b13
WebSocket - breaking out unfinished MUX extension into its own module
2013-07-30 15:09:40 -07:00
Joakim Erdfelt
b63a6047d3
WebSocket - better protection on metadata cache
2013-07-30 14:42:08 -07:00
Joakim Erdfelt
6fc7e23dc0
Testing for non-null
2013-07-30 14:41:28 -07:00
Joakim Erdfelt
4d36627a63
JSR-356 fixing NPE on bufferPool
2013-07-30 14:32:41 -07:00
Joakim Erdfelt
f8172e5a59
JSR-356 fixing calling of @OnMessage with partial message boolean
2013-07-30 14:27:48 -07:00
Joakim Erdfelt
702b675e86
JSR-356 Fixing dispatching for Streaming reads
2013-07-30 12:49:04 -07:00
Joakim Erdfelt
37feaea34b
JSR-356 adding support for javax.websocket.server.ServerApplicationConfig
2013-07-29 15:55:22 -07:00
Joakim Erdfelt
b363400c84
JSR-356 - making SessionFactory additive to allow multiple impls at the same time.
2013-07-29 09:30:42 -07:00
Joakim Erdfelt
e5655fc2cd
JSR-356 tweaking use of configureContext
2013-07-26 14:10:03 -07:00
Joakim Erdfelt
6029826aa4
JSR-356 using Spec 6.4 properly for access to ServerContainer
2013-07-26 14:04:17 -07:00
Joakim Erdfelt
6076e05bf6
JSR-356 fixing oddly worded exception
2013-07-26 14:04:17 -07:00
Joakim Erdfelt
ca23911075
JSR-356 - Changing to ServerContainer access.
...
+ Using technique as outlined in JSR-356 spec, Section 6.4
2013-07-26 14:04:17 -07:00
Joakim Erdfelt
daac0e6784
JSR-356 Adding etc/jetty-websockets.xml for JSR configuration
2013-07-25 09:59:34 -07:00
Joakim Erdfelt
b549410932
JSR-356 - Making WebSocketUpgradeFilter an attribute in the ServletContext
2013-07-25 09:43:47 -07:00
Joakim Erdfelt
d7d4e415ea
JSR-356 - making use of ServiceLoader technique for finding Extensions
2013-07-24 14:46:59 -07:00
Joakim Erdfelt
d967dafe45
JSR-356 - Refactoring Annotated method parameter detection and use
2013-07-24 12:32:15 -07:00