Joakim Erdfelt
1ce66f38a0
444771 - JSR356 / EndPointConfig.userProperties are not unique per
...
endpoint upgrade
+ Adding testcase & implementation which honors the
ServerEndpointConfig.userProperties copy at an earlier point.
2014-09-22 11:59:43 -07:00
Joakim Erdfelt
b633778b33
444748 - WebSocketClient.stop() does not unregister from ShutdownThread
...
+ Making (de)register smart about if wsclient is registered or not
2014-09-22 11:18:30 -07:00
Joakim Erdfelt
9b7b54ea0b
444517 - Ensure WebSocketUpgradeFilter is always first in filter chain
...
* Using Servlet 3.1's ServletContext.addFilter() mechanisms with its
FilterRegistration to encourage the WebSocketUpgradeFilter to be
first in the filter chain.
Note: this is possible, but can be overridden by another call
to the same ServletContext.addFilter() using the same techniques
to put something in front of the WebSocketUpgradeFilter.
2014-09-18 11:11:31 -07:00
Joakim Erdfelt
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
Jesse McConnell
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
Simone Bordet
9dbd2cd9d8
442950 - Embedded Jetty client requests to localhost hangs with high cpu usage (NIO OP_CONNECT Solaris/Sparc).
...
Now checking the return value of SocketChannel.connect() to determine
whether to register the channel (true) or finish the connect (false).
2014-09-01 11:28:59 +02:00
Greg Wilkins
eee2ba206e
435322 Added a idleTimeout to the SharedBlockerCallback
2014-08-29 11:55:06 +10:00
Joakim Erdfelt
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
Joakim Erdfelt
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
Greg Wilkins
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
Greg Wilkins
31359b1775
ignore failing tests
2014-07-23 15:23:35 +10:00
Simone Bordet
745f757552
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-07-15 18:49:14 +02:00
Greg Wilkins
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
Simone Bordet
f2f19ee3ba
Improved changes introduced by a746d78
.
2014-06-26 10:08:13 +02:00
Greg Wilkins
a746d78951
438079 435322 Fixed Iterating Callback fail handling and removed per send instance
2014-06-25 19:20:03 +02:00
Joakim Erdfelt
a41dd1caf5
436874 - WebSocket client throwing a NullPointer when handling a pong
...
+ Adding NPE guard for PONG with no payload.
2014-06-11 08:30:52 -07:00
Jesse McConnell
c3ee0711ca
[maven-release-plugin] prepare for next development iteration
2014-06-09 13:37:54 -05:00
Jesse McConnell
06b494eeac
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
2014-06-09 13:37:49 -05:00
Jesse McConnell
10b6c574ae
Merge branch 'master' into release-9
2014-06-09 13:07:22 -05:00
Joakim Erdfelt
ce8920dd76
Removing test noise
2014-05-29 11:52:36 -07:00
Joakim Erdfelt
54051baa2f
Enabling testcases
2014-05-29 11:48:53 -07:00
Joakim Erdfelt
7412951373
Removing experimental testcase that is no longer relevant
2014-05-29 11:46:36 -07:00
Joakim Erdfelt
7b3fc2cecf
Enabling testcase, reducing logging level
2014-05-29 11:42:50 -07:00
Joakim Erdfelt
f00cd9f6ec
Enabling and fixing testcase
2014-05-29 11:41:44 -07:00
Joakim Erdfelt
353b0f80c8
Enabling and fixing testcase
2014-05-29 11:39:36 -07:00
Jesse McConnell
2e859e4ae2
[maven-release-plugin] prepare for next development iteration
2014-05-26 12:04:15 -05:00
Jesse McConnell
71ad2114c5
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
2014-05-26 12:04:08 -05:00
Jesse McConnell
d59dbe936b
[maven-release-plugin] prepare for next development iteration
2014-05-23 09:59:19 -05:00
Jesse McConnell
edc7646a4c
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
2014-05-23 09:59:13 -05:00
Joakim Erdfelt
f2ea8351b6
429390 - Decoders and Encoders are not registered for non-annotated ClientEndpoint
...
+ Adding EncoderTest to verify reported bug
+ Fixing SimpleEndpointMetadata to propagate the encoder/decoder list
when present.
2014-05-22 13:12:39 -07:00
Joakim Erdfelt
bcf52e14f0
435206 - Can't add Cookie header on websocket ClientUpgradeRequest
...
+ Fixed competing cookie setters between WebSocketClient's use of
CookieStore and UpgradeRequest.setCookies()
+ Added some utility methods to LazyList (for lack of existence of
ListUtil or CollectionUtil in jetty-util)
2014-05-20 11:57:35 -07:00
Joakim Erdfelt
5b009dbe15
Adding FrameDebugExtension ability
2014-05-16 08:32:30 -07:00
Joakim Erdfelt
ab67143c29
Fixing felix/bundle plugin configuration to make tycho happy
2014-05-14 16:36:17 -07:00
Joakim Erdfelt
e0e00b0aed
430418 - Jetty 9.1.3 and Chrome 33 permessage-deflate do not work together
...
+ Updating Compress/PerMessageDeflate extensions for latest spec
document, http://tools.ietf.org/html/draft-ietf-hybi-permessage-compression-18
Intra-frame tail 0000FFFF is now being preserved for
permessage-deflate
2014-05-14 13:02:12 -07:00
Simone Bordet
a2b6c69525
Fixed field initialization problem.
2014-05-14 21:25:04 +02:00
Joakim Erdfelt
cd003dcea0
Adjusting test timeouts for slow systems
2014-05-13 09:23:54 -07:00
Joakim Erdfelt
9fb6e96a40
Discard windows specific logger, no longer needed
2014-05-12 16:37:46 -07:00
Joakim Erdfelt
832332aaad
434685 - WebSocket read/parse does not discard remaining network buffer after unrecoverable error case
...
+ Make all future onFillable events after a fundamental read/parse
exception discard the network buffer.
2014-05-12 16:36:47 -07:00
Joakim Erdfelt
8e3921b615
Setting up windows-7 specific logging for AnnotatedMaxMessageSize test failure
2014-05-12 10:38:20 -07:00
Joakim Erdfelt
8521a7875a
433405 - Websocket Session.setMaxIdleTimeout fails with zero
...
+ Make idle timeout check not fail on 0 (which is valid)
2014-05-09 11:23:57 -07:00
Joakim Erdfelt
88a1512d44
431333 - NPE In logging of WebSocket ExtensionConfig
...
+ Fixed NPE
2014-05-09 10:36:25 -07:00
Joakim Erdfelt
f9fad8f49f
434395 - WebSocket / memory leak, WebSocketSession not cleaned up in abnormal closure cases
...
+ Cleanup for read, bug fix for this occurred in prior commits
surrounding CLOSE handling
2014-05-08 14:08:20 -07:00
Joakim Erdfelt
8b118ba66d
Allowing alternate timeout check in testcase
2014-05-08 13:10:23 -07:00
Joakim Erdfelt
74e7195356
433262 - WebSocket / Advanced close use cases
...
+ because of the race condition in close on testNetworkCongestion(), the
test has been modified to allow for either close condition as valid.
2014-05-07 16:14:50 -07:00
Joakim Erdfelt
8ff1cec570
433262 - WebSocket / Advanced close use cases
...
+ AWSC.Flusher.onFailure() now uses IOState properly.
+ IOState now tracks the final CLOSED CloseInfo atomically
+ Renamed IOState.onReadEOF() to .onReadFailure(Throwable)
+ Added IOState.onWriteFailure(Throwable)
2014-05-07 13:12:09 -07:00
Joakim Erdfelt
fa5a5f3507
Adding javadoc
2014-05-07 13:12:09 -07:00
Joakim Erdfelt
7d662360f1
434077 - AnnotatedServerEndpointTest emits strange exception
...
Adding lock around use of remote, eliminating artificial EofException.
2014-05-06 12:14:00 -07:00
Joakim Erdfelt
f5648a2096
Removing yet another noisy dump
2014-05-06 12:14:00 -07:00
Joakim Erdfelt
5635f02235
433793 - WebSocket / empty protocol list in ServerEndpointConfig.Configurator when using non-exact header name
...
+ Marking header (and parameter) maps as case-insensitive.
2014-05-05 13:46:58 -07:00
Joakim Erdfelt
8e957b5a23
Reducing the noise on websocket testing
2014-05-05 12:09:58 -07:00
Joakim Erdfelt
c0e0f9bb83
431459 - Jetty WebSocket compression extensions fails to handle big messages properly
...
+ Setting up Assume for deregistered compression extension tests
2014-05-05 12:09:58 -07:00
Joakim Erdfelt
c03388b640
431459 - Jetty WebSocket compression extensions fails to handle big messages properly
...
+ Setting compression extensions to default unregistered state until
they can be stablized.
2014-05-05 12:09:58 -07:00
Greg Wilkins
dea8d684a6
434077 Avoid close race in websocket echo test
2014-05-05 15:12:45 +02:00
Greg Wilkins
51c5a4c833
425421 ContainerLifeCycle does not start added beans in started state
2014-05-05 14:53:53 +02:00
Jan Bartel
800a6639a3
Ensure annotation-related code is optional for tests with jdk8
2014-04-29 20:55:49 +02:00
Greg Wilkins
2e261b75d6
433692 improved buffer resizing
2014-04-29 20:36:13 +02:00
Joakim Erdfelt
703deea1df
Tidying up ws-test-client read operations (in hope that it will address test failures on jenkins)
2014-04-25 12:48:04 -07:00
Joakim Erdfelt
c7dd3481c6
Turning on websocket-common/io debug for jenkins testing
2014-04-25 12:37:00 -07:00
Joakim Erdfelt
1fb578165f
433262 - WebSocket / Advanced close use cases
...
+ Improved test case handling of frame reading (to prevent future
false failures)
+ Improved AbstractWebSocketConnection handling of close -> disconnect
to only trigger on successful write (or failure) of close frame flush
attempt.
+ Flusher close on all forms of disconnect, even half-closed.
2014-04-25 07:33:29 -07:00
Joakim Erdfelt
2bc9accd98
433262 - WebSocket / Advanced close use cases
...
+ Fixing bad assumptions in unit tests where the client would send a few
frames to test the protocol behavior followed by the close frame.
But the test expected the server to initiate the close, but this setup
of the tests would mean that the client initiated the close.
2014-04-23 12:56:00 -07:00
Joakim Erdfelt
900dea3719
433262 - WebSocket / Advanced close use cases
...
+ ClientCloseTest implementation of various outlined use cases.
2014-04-22 16:07:45 -07:00
Joakim Erdfelt
db2c6c20b9
Test failure fix
2014-04-15 10:16:52 -07:00
Joakim Erdfelt
cad7d3f5ed
Attempt to work out websocket close notification issue that simone raised
2014-04-15 10:14:03 -07:00
Greg Wilkins
c5e1e249e7
set version for 9.2.x
2014-03-31 11:35:06 +11:00
Greg Wilkins
710ea48244
430654 430242 - Closeable SharedBlockingCallback
2014-03-22 09:36:09 +11:00
Greg Wilkins
5d83a43cce
430242 - added SharedBlockingCallback to support threadsafe blocking
2014-03-22 08:42:03 +11:00
Greg Wilkins
138dfba560
Revert "430242 - added SharedBlockingCallback to support threadsafe blocking"
...
This reverts commit 9c30e7a303
.
2014-03-21 17:55:48 +11:00
Greg Wilkins
a85b855921
Revert ALPN and java 8 changes to move to another branch
...
Reverts e9ecd8c,2f22a10,addc49f,f4e4b09,cf1c245
Disabled unit test from commit 47e7583
2014-03-19 12:54:04 +11:00
Joakim Erdfelt
47e7583ada
430088 - OnMessage*Callable decoding of streaming binary or text is not thread safe
...
+ Adding testcase for Decoder.TextStream and lots of short messages with
order indicator (for the order in which they were sent)
Test case validates that all of the messages were received, not that
they were in any particular order (as the use of Streaming prevents
reliable ordering)
+ Adding defensive copy of callable array in order to prevent any
possibility of concurrency issues with streams and dispatched
calls.
2014-03-17 15:05:55 -07:00
Joakim Erdfelt
e1417861b9
430088 - OnMessageTextStreamCallable is not thread safe
...
+ Adding client side testcase for Decoder.TextStream use with a Reader
and multiple frames being received.
2014-03-14 13:46:47 -07:00
Greg Wilkins
9c30e7a303
430242 - added SharedBlockingCallback to support threadsafe blocking
2014-03-13 21:12:55 +11:00
Greg Wilkins
4de73d508b
430242 - added SharedBlockingCallback to support threadsafe blocking
2014-03-13 14:46:00 +11:00
Joakim Erdfelt
b95e454f7d
417022 - Access current HttpConnection from Request not ThreadLocal
...
+ Adjusting WebSocketServerFactory.upgrade() to receive HttpConnection
from Request object instead of ThreadLocal.
2014-03-11 12:12:44 -07:00
Joakim Erdfelt
6802dbd75c
Cleaning up imports
2014-03-11 10:45:37 -07:00
Jan Bartel
b6f36dadb2
Add appropriate headers to allow ServiceLoader mechanism to work with OSGi.
2014-03-10 13:42:05 +11:00
Jesse McConnell
0ec0d452e9
[maven-release-plugin] prepare for next development iteration
2014-03-07 09:10:08 -06:00
Jesse McConnell
1e555567a9
[maven-release-plugin] prepare release jetty-9.1.3.v20140225
2014-03-07 09:10:08 -06:00
Joakim Erdfelt
a3e5e0858c
428595 - JSR-356 / ClientContainer does not support SSL
...
+ Default SslContextFactory initialized
+ Setting for trustAll configurable via System property
"org.eclipse.jetty.websocket.jsr356.ssl-trust-all"={bool}
2014-03-06 13:28:56 -07:00
Joakim Erdfelt
5d36a4cb73
428594 - File upload with onMessage and InputStream fails
...
+ Adding unit test to verify reported behavior
2014-03-06 13:19:30 -07:00
Joakim Erdfelt
f282ffe897
429779 - masked zero length websocket frame gives NullPointerException during streaming read
...
+ Corrected payload buffer copying to ignore null and empty payloads
2014-03-06 11:29:42 -07:00
Jan Bartel
6959d911d5
428597 javax-websocket-client-impl and javax-websocket-server-impl jars Manifests do not export packages for OSGI
2014-03-06 16:47:10 +11:00
Jan Bartel
af3f2f4894
429409 [osgi] jetty.websocket.servlet must import jetty.websocket.server
2014-03-03 12:54:11 +11:00
Simone Bordet
4031bc7f3b
Reduced websocket memory footprint by releasing the HTTP machinery
...
(request and response) after the upgrade.
2014-02-24 23:44:21 +01:00
Simone Bordet
4123001158
Removed UpgradeContext since it was not used.
2014-02-24 23:44:21 +01:00
Joakim Erdfelt
b3bfe2783f
Fixing WebSocketSession.suspend()
2014-02-24 08:08:11 -07:00
Simone Bordet
f465a13d6d
428435 - Large streaming message fails in MessageWriter.
...
Fixed buffering, synchronization and callback notification in the
websocket stream implementation classes.
2014-02-24 14:28:10 +01:00
Greg Wilkins
d349d640c0
428859 Do not auto initialise jsr356 websocket if no annotations or EndPoints discovered
2014-02-24 16:31:56 +11:00
Simone Bordet
7db67ff58f
Removed @SuppressWarnings("ForLoopReplaceableByForEach") because
...
it is a non standard warning not treated by the compiler but only
by IDEs. Relevant lines have comments in any case.
2014-02-21 14:50:45 +01:00
Simone Bordet
7d6c1548b1
428232 - Rework batch mode / buffering in websocket.
...
Fixed missing notification of the FLUSH_FRAME.
2014-02-20 22:17:16 +01:00
Simone Bordet
c3c4d059a6
Removed unnecessary synchronization.
2014-02-20 15:44:22 +01:00
Greg Wilkins
15952aeee4
428232 - Rework batch mode / buffering in websocket.
2014-02-21 00:54:32 +11:00
Simone Bordet
75cc42a647
Improved dump() output.
2014-02-19 23:18:14 +01:00
Joakim Erdfelt
395e8f1c8b
Adding examples of managing the websocket extensions
2014-02-19 11:32:18 -07:00
Joakim Erdfelt
6b1f17b503
Demonstration of BFINAL
2014-02-19 11:32:18 -07:00
Joakim Erdfelt
c1f547e2b3
Adding javadoc
2014-02-19 11:32:18 -07:00
Simone Bordet
b8df85ec48
Session open and close are now logged at debug level.
2014-02-18 18:51:05 +01:00
Simone Bordet
1ac6b82912
428232 - Rework batch mode / buffering in websocket.
...
Introduced the automatic batch mode, akin to Jetty 8's WebSocket
implementation.
Now, if there are no more frames to process, and the previous frames
have been aggregated, FrameFlusher auto-flushes the aggregated frames.
This simplifies applications because they don't need to call flush()
explicitly.
2014-02-18 18:31:49 +01:00
Simone Bordet
3240e7383b
428232 - Rework batch mode / buffering in websocket.
...
Improved logging by wrapping LOG.debug() calls in a
if (LOG.isDebugEnabled()) statement to avoid boxing of primitive
values.
2014-02-18 18:31:49 +01:00
Simone Bordet
0786da6cd0
428232 - Rework batch mode / buffering in websocket.
...
Avoid to create a new ByteBuffer just to create the mask integer,
saves allocation cost.
2014-02-18 18:31:49 +01:00
Simone Bordet
61b4b0f029
428232 - Rework batch mode / buffering in websocket.
...
Better default size for SimpleTextMessage Utf8StringBuilder,
to avoid multiple expansions and data copy of the underlying array.
2014-02-18 18:31:48 +01:00