5770cc1179
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
2014-10-30 11:28:35 -05:00
58eb6740ec
[maven-release-plugin] prepare for next development iteration
2014-10-28 14:20:30 -05:00
19a44846cf
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
2014-10-28 14:20:24 -05:00
8d2acb6817
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-28 11:55:44 +01:00
e32f26354d
449038 - WebSocketUpgradeFilter must support async.
...
Now calling setAsyncSupported(true) for the WebSocketUpgradeFilter.
2014-10-28 11:52:00 +01:00
7cdcd69f44
Reverted version to 9.2.4-SNAPSHOT.
2014-10-28 11:52:00 +01:00
3b745f06df
[maven-release-plugin] prepare for next development iteration
2014-10-27 16:16:24 -05:00
4f0d78c91b
[maven-release-plugin] prepare release jetty-9.2.4.v20141027
2014-10-27 16:16:18 -05:00
758ce66c8d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-websocket/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
ab930aae9f
446033 - org.eclipse.jetty.websocket.server.WebSocketServerFactory not available in OSGi
...
+ Tweaking version identifiers in websocket
+ Adding oej.websocket.server.pathmap to Dynamic-Import of
websocket-servlet manifest
2014-10-08 14:46:57 -07:00
93520df3f9
445374 - Reevaluate org.eclipse.jetty.websocket.jsr356 enablement concepts
...
+ Since SCI adds filters, but init() isn't run till later, that means
the context attribute for the WebSocketUpgradeFilter isn't present
during jsr356 runs. Added ability for manual filter creation to call
setToAttribute() as a pre-init step, allowing the init() itself to
bypass the set to attribute for that specific filter instance.
+ This also means ServletException is now thrown out from the
various configureContext() static methods.
2014-09-30 10:56:48 -07:00
7e54472801
445374 - Reevaluate org.eclipse.jetty.websocket.jsr356 enablement concepts
...
+ After talking it through with Simone, swapping out 'global' init-param
with a bit more robust 'contextAttributeKey' to handle the automatic
context.setAttribute() of the filter itself.
As simply having a filter in the web.xml makes it alive, but nothing
is wired up into it, and accessing the filter instance via the
context metadata seems impossible. So we made the init-param for
'contextAttributeKey' important and required, but with defaulting
and validation checks.
2014-09-30 10:08:44 -07:00
6500931f8c
445374 - Reevaluate org.eclipse.jetty.websocket.jsr356 enablement concepts
...
+ Making key also work inside of WEB-INF/web.xml via context params
+ Making WebSocketUpgradeFilter generic enough to be used in a
web.xml descriptor
+ Adding global={bool} init-param on WebSocketUpgradeFilter to aid
library developers and end users more ways to tweak the filter
order
2014-09-30 07:40:07 -07:00
8d2efaf7eb
445167 - Allow configuration of dispatch after select.
...
Introduced parameter "dispatchIO" in the relevant factories so that
they can be configured by users and connections will be created
taking into account this parameter.
For less configurable connection factories, this parameter is
currently hardcoded to either true or false depending on the case.
For example, ALPN and NPN connections have it to false, since they
don't do any blocking operation in onFillable().
2014-09-26 10:13:16 +02:00
a8b461fe91
Cosmetics: removed unused imports, cleaned up source code, improved javadocs.
2014-09-26 10:13:16 +02:00
1e33c32513
Merged branch 'jetty-9.2.x' into 'master'.
2014-09-23 18:48:16 +02:00
d4d62c5690
438387 - NullPointerException after ServletUpgradeResponse.sendForbidden
...
is called during WebSocketCreator.createWebSocket
+ Adding NPE guard for error/forbidden/complete flows
2014-09-23 09:46:06 -07:00
0bf68a07ae
442495 - Bad Context ClassLoader in JSR356 WebSocket onOpen
...
+ Fixing onOpen context classloader to be that of the context
that started the WebSocketUpgradeFilter (which will be the
same as the WebAppContext in most cases)
2014-09-23 11:33:44 +02:00
901707b894
444617 - Expose local and remote socket address to applications
...
+ Exposing 2 new automatically added userProperties
* "javax.websocket.endpoint.localAddress"
* "javax.websocket.endpoint.remoteAddress"
these are both java.net.InetSocketAddress objects
2014-09-23 11:33:44 +02:00
e93247de42
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-23 11:33:44 +02:00
65cae13b1e
444748 - WebSocketClient.stop() does not unregister from ShutdownThread
...
+ Making (de)register smart about if wsclient is registered or not
2014-09-23 11:33:44 +02:00
f3693219f8
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-23 11:33:43 +02:00
0dca1b0794
442495 - Bad Context ClassLoader in JSR356 WebSocket onOpen
...
+ Fixing onOpen context classloader to be that of the context
that started the WebSocketUpgradeFilter (which will be the
same as the WebAppContext in most cases)
2014-09-22 14:37:00 -07:00
d6082b2d65
444617 - Expose local and remote socket address to applications
...
+ Exposing 2 new automatically added userProperties
* "javax.websocket.endpoint.localAddress"
* "javax.websocket.endpoint.remoteAddress"
these are both java.net.InetSocketAddress objects
2014-09-22 12:43:37 -07:00
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
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
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
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
ee3ab1f8ea
Merged branch 'master' into 'jetty-http2'.
2014-09-01 11:57:09 +02:00
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
edcb56ae6b
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-08-29 12:41:52 +10:00
eee2ba206e
435322 Added a idleTimeout to the SharedBlockerCallback
2014-08-29 11:55:06 +10:00
1c71040eca
moved config plugin to profile
2014-08-15 19:53:52 +10:00
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
a14d843382
ignored osgi-spdy tests
2014-08-14 15:18:28 +10:00
6dfa452e29
case insensitive protocols
2014-08-07 19:00:31 +10:00
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
2f41275b0f
fixed merge syntax errors
2014-07-23 16:57:36 +10:00
fa3d7d0f7e
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
ecb3ab7e5b
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2014-07-23 16:38:15 +10:00
31359b1775
ignore failing tests
2014-07-23 15:23:35 +10:00
7f62f2600b
refactored URI handling
2014-07-20 10:23:47 +10:00
853e020210
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-16 15:31:48 +10:00
745f757552
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-07-15 18:49:14 +02:00
fff2dd2f2d
misc test fixes for rfc7230 issues
2014-07-11 16:10:06 +10:00
5e281dd449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
2608af8f0d
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-26 11:54:50 +02:00
f2f19ee3ba
Improved changes introduced by a746d78.
2014-06-26 10:08:13 +02:00
a746d78951
438079 435322 Fixed Iterating Callback fail handling and removed per send instance
2014-06-25 19:20:03 +02:00
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
adaeeefe32
Merged branch 'master' into 'jetty-http2'.
2014-06-16 16:08:40 +02:00
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
c3ee0711ca
[maven-release-plugin] prepare for next development iteration
2014-06-09 13:37:54 -05:00
06b494eeac
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
2014-06-09 13:37:49 -05:00
10b6c574ae
Merge branch 'master' into release-9
2014-06-09 13:07:22 -05:00
bb4d42f139
Merge remote-tracking branch 'origin' into jetty-http2
2014-06-04 15:09:19 +02:00
8f4aeeeb8d
updated version to 10.0.0-SNAPSHOT
2014-06-04 15:08:54 +02:00
ce8920dd76
Removing test noise
2014-05-29 11:52:36 -07:00
54051baa2f
Enabling testcases
2014-05-29 11:48:53 -07:00
7412951373
Removing experimental testcase that is no longer relevant
2014-05-29 11:46:36 -07:00
7b3fc2cecf
Enabling testcase, reducing logging level
2014-05-29 11:42:50 -07:00
f00cd9f6ec
Enabling and fixing testcase
2014-05-29 11:41:44 -07:00
353b0f80c8
Enabling and fixing testcase
2014-05-29 11:39:36 -07:00
2e859e4ae2
[maven-release-plugin] prepare for next development iteration
2014-05-26 12:04:15 -05:00
71ad2114c5
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
2014-05-26 12:04:08 -05:00
d59dbe936b
[maven-release-plugin] prepare for next development iteration
2014-05-23 09:59:19 -05:00
edc7646a4c
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
2014-05-23 09:59:13 -05:00
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
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
5b009dbe15
Adding FrameDebugExtension ability
2014-05-16 08:32:30 -07:00
ab67143c29
Fixing felix/bundle plugin configuration to make tycho happy
2014-05-14 16:36:17 -07:00
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
a2b6c69525
Fixed field initialization problem.
2014-05-14 21:25:04 +02:00
cd003dcea0
Adjusting test timeouts for slow systems
2014-05-13 09:23:54 -07:00
9fb6e96a40
Discard windows specific logger, no longer needed
2014-05-12 16:37:46 -07:00
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
8e3921b615
Setting up windows-7 specific logging for AnnotatedMaxMessageSize test failure
2014-05-12 10:38:20 -07:00
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
88a1512d44
431333 - NPE In logging of WebSocket ExtensionConfig
...
+ Fixed NPE
2014-05-09 10:36:25 -07:00
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
8b118ba66d
Allowing alternate timeout check in testcase
2014-05-08 13:10:23 -07:00
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
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
fa5a5f3507
Adding javadoc
2014-05-07 13:12:09 -07:00
7d662360f1
434077 - AnnotatedServerEndpointTest emits strange exception
...
Adding lock around use of remote, eliminating artificial EofException.
2014-05-06 12:14:00 -07:00
f5648a2096
Removing yet another noisy dump
2014-05-06 12:14:00 -07:00
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
8e957b5a23
Reducing the noise on websocket testing
2014-05-05 12:09:58 -07:00
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
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
dea8d684a6
434077 Avoid close race in websocket echo test
2014-05-05 15:12:45 +02:00
51c5a4c833
425421 ContainerLifeCycle does not start added beans in started state
2014-05-05 14:53:53 +02:00
800a6639a3
Ensure annotation-related code is optional for tests with jdk8
2014-04-29 20:55:49 +02:00
2e261b75d6
433692 improved buffer resizing
2014-04-29 20:36:13 +02:00
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
c7dd3481c6
Turning on websocket-common/io debug for jenkins testing
2014-04-25 12:37:00 -07:00
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
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
900dea3719
433262 - WebSocket / Advanced close use cases
...
+ ClientCloseTest implementation of various outlined use cases.
2014-04-22 16:07:45 -07:00
db2c6c20b9
Test failure fix
2014-04-15 10:16:52 -07:00
cad7d3f5ed
Attempt to work out websocket close notification issue that simone raised
2014-04-15 10:14:03 -07:00
c5e1e249e7
set version for 9.2.x
2014-03-31 11:35:06 +11:00
710ea48244
430654 430242 - Closeable SharedBlockingCallback
2014-03-22 09:36:09 +11:00
5d83a43cce
430242 - added SharedBlockingCallback to support threadsafe blocking
2014-03-22 08:42:03 +11:00
138dfba560
Revert "430242 - added SharedBlockingCallback to support threadsafe blocking"
...
This reverts commit 9c30e7a303
2014-03-21 17:55:48 +11:00
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
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
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
9c30e7a303
430242 - added SharedBlockingCallback to support threadsafe blocking
2014-03-13 21:12:55 +11:00
4de73d508b
430242 - added SharedBlockingCallback to support threadsafe blocking
2014-03-13 14:46:00 +11:00
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
6802dbd75c
Cleaning up imports
2014-03-11 10:45:37 -07:00
b6f36dadb2
Add appropriate headers to allow ServiceLoader mechanism to work with OSGi.
2014-03-10 13:42:05 +11:00
0ec0d452e9
[maven-release-plugin] prepare for next development iteration
2014-03-07 09:10:08 -06:00
1e555567a9
[maven-release-plugin] prepare release jetty-9.1.3.v20140225
2014-03-07 09:10:08 -06:00
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
5d36a4cb73
428594 - File upload with onMessage and InputStream fails
...
+ Adding unit test to verify reported behavior
2014-03-06 13:19:30 -07:00
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
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
af3f2f4894
429409 [osgi] jetty.websocket.servlet must import jetty.websocket.server
2014-03-03 12:54:11 +11:00
4031bc7f3b
Reduced websocket memory footprint by releasing the HTTP machinery
...
(request and response) after the upgrade.
2014-02-24 23:44:21 +01:00
4123001158
Removed UpgradeContext since it was not used.
2014-02-24 23:44:21 +01:00
b3bfe2783f
Fixing WebSocketSession.suspend()
2014-02-24 08:08:11 -07:00
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
d349d640c0
428859 Do not auto initialise jsr356 websocket if no annotations or EndPoints discovered
2014-02-24 16:31:56 +11:00
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
7d6c1548b1
428232 - Rework batch mode / buffering in websocket.
...
Fixed missing notification of the FLUSH_FRAME.
2014-02-20 22:17:16 +01:00
c3c4d059a6
Removed unnecessary synchronization.
2014-02-20 15:44:22 +01:00
15952aeee4
428232 - Rework batch mode / buffering in websocket.
2014-02-21 00:54:32 +11:00
75cc42a647
Improved dump() output.
2014-02-19 23:18:14 +01:00
395e8f1c8b
Adding examples of managing the websocket extensions
2014-02-19 11:32:18 -07:00
6b1f17b503
Demonstration of BFINAL
2014-02-19 11:32:18 -07:00
c1f547e2b3
Adding javadoc
2014-02-19 11:32:18 -07:00
b8df85ec48
Session open and close are now logged at debug level.
2014-02-18 18:51:05 +01:00
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
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
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
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
996cc8bd92
428232 - Rework batch mode / buffering in websocket.
...
Optimized FrameFlusher to not create iterators when iterating over a
list, saving allocation costs.
2014-02-18 18:31:48 +01:00
4bdca367dd
428232 - Rework batch mode / buffering in websocket.
...
Refactored FrameFlusher to handle aggregation of frames to support
JSR 356's batch mode.
Now FrameFlusher can aggregate frames as long as the FlushMode they
were sent is AUTO. When a frame that has FlushMode SEND arrives,
it will trigger the flush of the aggregate buffer (and eventually
also other queued frames).
A special BINARY frame is used to implement explicit flush()
invocations.
2014-02-18 18:31:48 +01:00
8e5c06b95c
428232 - Rework batch mode / buffering in websocket.
...
Refactored OutgoingFrames.outgoingFrame() to take an additional
parameter, FlushMode. This is in preparation for handling this new
parameter in FrameFlusher.
2014-02-18 18:31:48 +01:00
d2f1954fa0
427700 - Outgoing extensions that create multiple frames should flush
...
them in order and atomically.
Optimized CompressExtension to reduce data copying at minimum on the
write path.
2014-02-15 17:53:37 +01:00
a8e4caca90
427700 - Outgoing extensions that create multiple frames should flush
...
them in order and atomically.
Removed unused code.
2014-02-15 17:53:23 +01:00
a2a90c5c87
427700 - Outgoing extensions that create multiple frames should flush
...
them in order and atomically.
Modified FragmentExtension to use a Queue and IteratingCallback to
make sure that frames are iteratively fragmented.
The creation of the next fragment only happens when there is a callback
from the next outgoing layer.
2014-02-14 22:21:59 +01:00
ad15b27a01
427700 - Outgoing extensions that create multiple frames should flush
...
them in order and atomically.
Refactored PerMessageDeflateExtension and DeflateFrameExtension
introducing superclass CompressExtension that factors in common
functionalities.
2014-02-14 22:21:59 +01:00
81b8990dec
427700 - Outgoing extensions that create multiple frames should flush
...
them in order and atomically.
Modified DeflateFrameExtension to use a Queue and IteratingCallback to
make sure that frames are iteratively compressed in chunks.
The compression of the next chunk only happen when there is a callback
from the next outgoing layer.
2014-02-14 22:21:59 +01:00
53b1ee9e47
427700 - Outgoing extensions that create multiple frames should flush
...
them in order and atomically.
Modified ExtensionStack to use a Queue and IteratingCallback to make
sure that messages are processed sequentially.
2014-02-14 22:21:59 +01:00
cff7c9dbcb
Cleaning up websocket connection open/close in favor of session open/close
2014-02-13 16:22:55 -07:00
eb0aea46ce
set versions.txt file to new version and fix mistaken developmentVersion
2014-02-10 13:48:29 -06:00
f3d38dfb15
[maven-release-plugin] prepare for next development iteration
2014-02-10 11:17:14 -06:00
8f6cbc9111
[maven-release-plugin] prepare release jetty-9.1.2.v20140210
2014-02-10 11:17:07 -06:00
51e8b83954
427699 - WebSocket upgrade response sends Sec-WebSocket-Protocol twice.
...
The problem was that UpgradeResponse was setting the subProtocol as a
header, and HandshakeRFC6455 was extracting it and *adding* it again.
Fixed by removing the code in HandshakeRFC6455.
2014-02-10 14:43:22 +01:00
b37c68db3b
427690 - Remove Mux Extension and related support.
2014-02-10 13:10:58 +01:00
66a19bd646
Avoided to copy the frame payload if we happen to have it all
...
available.
2014-02-10 12:56:54 +01:00
18d2180cdc
427588 - WebSocket Parser leaks ByteBuffers.
...
Fixed by having the Parser release the payload ByteBuffer.
Also reworked WebSocketFrame.reset() method, and made sure
that outgoing frames also don't leak ByteBuffers.
2014-02-10 12:21:50 +01:00
21d938f12d
427587 - MessageInputStream must copy the payload.
...
Forgot to flip the buffer.
2014-02-06 22:39:02 +01:00
cf37533d87
427587 - MessageInputStream must copy the payload.
2014-02-06 21:18:21 +01:00
5d9360e343
427254 - Cookies are not sent to the client.
...
Introduced ServletUpgradeResponse.complete(), called when the response
is about to be sent to the client, to transfer the headers stored in
the superclass (UpgradeResponse.headers) into the HttpServletResponse.
2014-02-03 15:31:51 +01:00
cfe248c67b
427128 - Cookies are not sent to the server.
...
Implemented/fixed handling of cookies sent by client to server.
2014-02-03 12:49:58 +01:00
5e3c8821bb
If ClientContainer is being stopped, then we can unregister it from
...
the ShutdownThread.
This happens when ClientContainer is added as a managed bean to a
ContainerLifeCycle and the container is stopped.
2014-02-03 12:09:27 +01:00
1ff01f36eb
Fixing SessionTest failures on windows due to file locking
2014-01-14 15:09:57 -07:00
91429ea123
Merge branch 'release-9'
2014-01-10 09:11:25 -06:00
b82ec6e668
[maven-release-plugin] prepare for next development iteration
2014-01-08 16:47:09 -06:00
b99623a21d
[maven-release-plugin] prepare release jetty-9.1.1.v20140108
2014-01-08 16:47:01 -06:00
29dec203ba
Turning on some leak detection in websocket testing
2014-01-08 14:54:57 -07:00
9df519c40f
423948 - Cleanup and consolidate testing utilities in WebSocket
...
+ Created websocket-common-tests.jar artifact
+ Consolidated duplicate code from other websocket-* modules
into the websocket-common test artifact
2014-01-08 10:47:45 -07:00
fb8d55e46e
424735 - WebSocket / Make ServletUpgradeRequest expose its HttpServletRequest
...
+ Added ServletUpgradeRequest.getHttpServletRequest() to access the
underlying HttpServletRequest.
+ Wrapping underlying post-upgraded HttpServletRequest object with
many disabled methods that are no longer relevant at this
post-upgraded state of the connection.
2014-01-07 14:50:59 -07:00
259c624558
425038 - WebSocketClient leaks file handles when exceptions are thrown from open()
...
+ Close connection on open() exception
2014-01-07 13:19:01 -07:00
44a7d23516
423646 - WebSocket / JSR / WebSocketContainer (Client) should have its LifeCycle stop on standalone use
...
+ Set Daemon on Executor and Scheduler threads to allow them to shutdown
with the JVM
2014-01-07 13:08:10 -07:00
f0eeb27921
424847 - Deadlock in deflate-frame (webkit binary)
...
+ Moving notification flows to outside of the synchronization blocks
2014-01-07 11:47:19 -07:00
b59057c184
424863 - IllegalStateException "Unable to find decoder for type <javax.websocket.PongMessage>"
...
+ Expanding testing of PongMessage
+ Ensuring that .addMessage(MessageHandler.Whole<PongMessage>) works
+ Ensuring that ping or pong messages all goto assigned message
handler for PongMessage, for both extends Endpoint and
annotated @OnMessage
2014-01-06 17:54:57 -07:00
8016065823
424706 - The setMaxIdleTimeout of javax.websocket.Session does not take any affect
...
+ Making sure that JsrSession updates Connection on use of
setMaxIdleTimeout after a connection has been opened.
2014-01-06 15:07:02 -07:00
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
118fc97fe1
424734 - WebSocket / Expose Locale information from ServletUpgradeRequest
2013-12-29 17:05:41 -07:00
5380430b75
Tweaking idle timeout
2013-12-20 13:22:01 -07:00
5cf9640cfa
423724 - WebSocket / Rename MessageAppender.appendMessage to .appendFrame
2013-12-20 13:22:01 -07:00
ab9040bb63
424497 - Allow concurrent async sends
2013-12-20 11:49:33 +11:00
9a20a534b5
423646 - WebSocket / JSR / WebSocketContainer (Client) should have its LifeCycle stop on standalone use
...
+ Not working (yet), but narrowed down the problem.
2013-12-18 05:51:24 -07:00
8d621a9331
424043 - IteratingCallback Idle race.
...
A few renamings and fixes to avoid IllegalStateExceptions.
2013-12-15 23:51:04 +01:00
41fc2b8f87
424043 - IteratingCallback Idle race.
...
Renamed Next enum to Action, and renamed some constant of the State
enum to avoid confusion with the Action enum.
Simplified succeeded() and failed(Throwable) code,
covering also cases not covered before.
Fixed case SCHEDULED in succeeded() that was returning in case the
compareAndSet failed.
Fixed race in perform(), where 2 threads may execute concurrently
after having returned from process().
Vastly improved javadocs and comments.
2013-12-15 00:47:55 +01:00
7141483356
424043 - IteratingCallback Idle race
2013-12-14 09:14:12 +11:00
46ef022cf4
421314 - Websocket / Connect attempt with Chrome 32+ fails with "Some extension already uses the compress bit"
...
+ Reworked extension negotiation to be more consistent with the changes
to the spec that Chrome 32 are introducing. Namely that first
extension to claim RSV bit wins, all other conflicting extensions are
ignored.
2013-12-13 12:30:26 -07:00
5c296c99d8
Cleaning up tests
2013-12-13 12:30:25 -07:00
0104374adb
423048 - Receiving a PING while sending a message kills the connection
...
Optimised to remove msgLock and just have a concurrent state machine on msgType
2013-12-13 11:51:05 +11:00
0a30b4934b
423915 - WebSocket / Active connection from IOS that goes into airplane mode not disconnected on server side
...
+ Adding testcase verifying Native WebSocket API behavior
2013-12-12 17:04:35 -07:00
6d70aab61d
423915 - WebSocket / Active connection from IOS that goes into airplane mode not disconnected on server side
...
+ Working testcase for JSR-356
2013-12-12 16:58:42 -07:00
7af074bafb
423048 - Receiving a PING while sending a message kills the connection
...
+ Removed msgLock on control frames.
+ Moved sendPing() and sendPong() to async frame handling
+ Squelched a mess of stacktraces in the testing output
2013-12-12 16:08:53 -07:00
5941e9db83
Fixing various warnings / imports
2013-12-12 14:46:40 -07:00
ecf3b8a68f
421189 - WebSocket / AbstractExtension's WebSocketPolicy is not Session-specific
...
+ Ensuring that the EventDriver managed policy is used by the
ExtensionStack
2013-12-12 13:51:01 -07:00
bc7afdc172
423476 - WebSocket / JSR / @OnMessage(maxMessageSize=20000000) not properly supported
...
+ Correcting @OnMessage handling of max message size for TEXT/BINARY
from both @ClientEndpoint and @ServerEndpoint usage
+ Testcases to prevent regression.
2013-12-12 13:20:49 -07:00
120e0e59ca
Cleanup (Imports / StandardCharset / Dead APIs)
2013-12-11 17:27:58 -07:00
eb2f3acfbd
423804 - WebSocket / JSR improper use of ServerEndpointConfig.Configurator.getNegotiatedSubprotocol()
...
+ Correcting BasicServerEndpointConfigurator response for no subprotocol
+ Correcting JsrCreator assumption for no subprotocol
2013-12-11 17:00:28 -07:00
5bb1631c68
Removing conflicting javax.websocket:javax.websocket-client-api artifact
2013-12-11 17:00:28 -07:00
85f2bebab3
formatting cleanup
2013-12-11 17:00:28 -07:00
8f132a2e0c
Updating clirr comparison to first released 9.1
2013-12-11 17:00:28 -07:00
5b77679ecf
Attempted fix for intermittent test failures around MessageInputStream
2013-12-10 13:01:12 -07:00
54c22d0aca
418622 - WebSocket / When rejecting old WebSocket protocols, log client details
2013-12-09 17:00:18 -07:00
48fe92d939
423185 - Update permessage-deflate for finalized spec
...
+ Adding support for new permessage-deflate parameters
+ Tested against pywebsocket (rev 790)
+ Tested against Chrome Canary 32
2013-12-09 16:20:14 -07:00
db777310b5
WebSocket / RFC-6455: Section 5.1 frame masking validation
2013-12-09 16:20:14 -07:00
ebd0ad90e0
423118 - ServletUpgradeRequest.getUserPrincipal() does not work
...
+ Deprecating ServletUpgradeRequest.getPrincipal()
+ Adding proper implementation for
ServletUpgradeRequest.getUserPrincipal()
2013-12-04 12:29:20 -07:00
1eac013485
422192 - ClientContainer.getOpenSessions() always returns null
...
+ Adding SessionListener and using it judiciously
2013-12-04 12:24:48 -07:00
bae646de72
gave test more time
2013-11-28 13:55:42 +11:00
23091e2272
421697 - IteratingCallback improvements
...
made gather size configurable
2013-11-21 16:00:50 +11:00
0a52c64d16
421697 - IteratingCallback improvements
...
Use the iteratingcallback for websocket
use gather writes for websocket
always write entire websocket payload
2013-11-21 15:11:56 +11:00
1eb2997efd
421697 - IteratingCallback improvements
...
avoid wrapping writeCallback
Idle state added to IteratingCallback for SPDY
2013-11-21 14:52:39 +11:00
41f60bd152
421697 - IteratingCallback improvements
...
Cleanup WebSocket impl first
+ Logic for size on Generator was backwards.
+ Logic in Generator for RSV flags was incorrect.
+ Generalizing flagsInUse for Parser too
2013-11-21 12:40:32 +11:00
724afdaea6
Merge branch 'release-9.1' into jetty-9.1
2013-11-18 09:15:21 -07:00
9172d6115b
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:58:44 -07:00
6feeab6ec3
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:58:36 -07:00
7bbc0ff4df
[maven-release-plugin] rollback the release of jetty-9.1.0.v20131115
2013-11-15 16:33:52 -07:00
1126e68971
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:03:28 -07:00
d6418c73d4
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:03:20 -07:00
6c372b9440
Reverting <version> to 9.1.0-SNAPSHOT
2013-11-15 15:36:26 -07:00
e097ec1ae2
import cleanup
2013-11-15 09:00:16 -07:00
b5345caed1
[maven-release-plugin] prepare for next development iteration
2013-11-14 15:27:52 -06:00
1582aa196d
[maven-release-plugin] prepare release jetty-9.1.0.v20131114
2013-11-14 15:27:37 -06:00
63f20d4518
[maven-release-plugin] prepare for next development iteration
2013-11-07 10:42:54 -06:00
dc2fd1b9ce
[maven-release-plugin] prepare release jetty-9.1.0.RC2
2013-11-07 10:42:41 -06:00
d426138d0b
Fixing logic error in max length for ByteAccumulator
2013-11-06 17:30:49 -07:00
aba3a41a34
More fixes for Windows build
2013-11-04 16:50:18 -07:00
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
eb3bb660b5
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
6b0269a16d
[Bug 420930] Use Charset to specify character encoding
...
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
6f1eb712e9
Cleaning up imports
2013-11-01 10:03:40 -07:00
50a960ef70
410656 - WebSocketSession.suspend() hardcoded to return null
2013-11-01 10:01:42 -07:00
513d2ca758
Fixing @WebSocket(maxBinaryMessageSize=#} handling
2013-10-30 09:29:57 -07:00
e2da5fc7f1
Removing unused imports
2013-10-30 09:29:57 -07:00
5965e695fa
Cleaning up modules
2013-10-24 14:06:50 -07:00
275008d207
attempting to fix occasional test failure
2013-10-23 12:19:22 -07:00
dbc4f5357a
Merge fixes
...
+ @Ignore on PathMapTest
2013-10-18 16:12:19 -07:00
d6d54e048b
Merge branch 'master' into jetty-9.1
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/AnnotatedMaxMessageSizeTest.java
2013-10-18 16:12:00 -07:00
61dc8e1eff
419814 - Annotation properties maxMessageSize and inputBufferSize don't work
...
+ Ensured that WebSocketPolicy from annotations is propagated properly
during connection creation.
2013-10-18 10:25:51 -07:00
15e32cc9b0
419814 - Annotation properties maxMessageSize and inputBufferSize don't work
...
+ Adding extra testcase for maxMessageSize
2013-10-18 09:39:48 -07:00
a3424532e8
fixed bad merge
2013-10-14 13:44:52 +11:00
defa3a04cf
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-10-14 13:10:02 +11:00
33b10efcaa
Merge remote-tracking branch 'origin/release-9'
2013-10-14 11:12:31 +11:00
1eca1e7c3c
Making subprotocol negotiation behavior report warnings on bad configuration
2013-10-10 09:04:45 -07:00
2944339893
Fixing websocket browser test utility header lookup
2013-10-10 08:43:49 -07:00
180d9a55df
418792 - Session getProtocolVersion always returns null
...
+ Backporting just the getProtocolVersion from jetty 9.1
2013-10-07 16:45:21 -07:00
a0ddb2c5d7
418632 - WebSocket / Jsr annotated @OnMessage with InputStream fails to be called
...
+ Fixed load order issue with binary vs text
+ Fixed decoder assignment for InputStream
+ Added unit tests to prevent regression of this feature
2013-10-03 16:07:49 -07:00
8d5013e15f
418625 - WebSocket / Jsr RemoteEndpoint.sendObject(java.nio.HeapByteBuffer) doesn't find encoder
...
+ Adding fallback lookup using isAssignable(type) if basic map based
lookup fails first. Remembers successful isAssignable(type) match
for future lookups via basic map approach.
2013-10-03 14:05:04 -07:00
d2c3d7cf09
418603 - cannot specify a custom ServerEndpointConfig.Configurator
...
+ Fixing bad assumption on annotations possibly being null
2013-10-03 09:13:37 -07:00
856a24b65a
[maven-release-plugin] prepare for next development iteration
2013-09-30 14:46:09 -05:00
f466f03c6a
[maven-release-plugin] prepare release jetty-9.0.6.v20130930
2013-09-30 14:46:00 -05:00
0b3f431d27
set version back to 9.0.6-SNAPSHOT
2013-09-30 12:33:06 -05:00
1ccba6e172
Clean up class + param order consistency
2013-09-26 10:30:29 -07:00
Jesse McConnell
Simone Bordet
Greg Wilkins
Joakim Erdfelt
Jan Bartel
Mikhail Mazursky