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
b966545a95
417152 - WebSocket / Do all setup in websocket specific ServletContainerInitializer
...
+ removing etc/jetty-websockets.xml (now irrelevant)
2013-09-26 10:13:12 -07:00
e92f0965c7
Removing scope test
2013-09-26 06:06:23 -07:00
b52d7f09b0
418068 WebSocketClient has lazy or injected Executor
2013-09-26 18:06:55 +10:00
edf0e4f707
Removing websocket.mod ini-template, as using the mod is the same as the ini-template
2013-09-24 09:02:04 -07:00
cd236bc016
417152 - WebSocket / Do all setup in websocket specific ServletContainerInitializer
...
+ Removed WebSocketConfiguration class entirely + annotation handlers
+ Renamed ServerAppliationConfigListener to
WebSocketServerContainerInitializer
+ Embedded jetty code that used to use:
WebSocketContainer.configureContext(context) now uses
WebSocketServerContainerInitializer.configureContext(context)
2013-09-23 13:30:14 -07:00
0525498ad3
[maven-release-plugin] prepare for next development iteration
2013-09-19 15:06:31 -05:00
c05a725db6
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
2013-09-19 15:06:17 -05:00
73d0ed8d71
417561 Refactor annotation related code
...
Rename and refactor ServletContainerInitializerListener
2013-09-19 22:31:36 +10:00
d4c035a06f
417561 Refactor annotation related code to remove some deadwood
2013-09-19 15:43:38 +10:00
aa5705fd78
417490 - WebSocket / @PathParam annotated parameters are null when the servlet mapping uses a wildcard
...
+ Fixing ServletUpgradeRequest.getRequestPath() to conform to behavior
found in WebSocketUpgradeFilter.doFilter()
2013-09-18 06:35:12 -07:00
f44787075a
417382 - Upgrade to asm 4.1 and refactor annotation parsing
2013-09-17 13:12:54 +10:00
7f85842666
417134 - WebSocket / Jsr ServerEndpointConfig.Configurator.getNegotiatedExtensions() is never used
...
+ Extensions pre-negotiated via
ServerEndpointConfig.Configurator.getNegotiatedExtensions are not
properly handled.
+ Added JsrBrowserDebugTool (Jsr version of BrowserDebugTool)
2013-09-12 15:25:02 -07:00
5445c42ffe
417133 - WebSocket / deflate-frame should accumulate decompress byte buffers properly
...
+ Adding ByteAccumulator to make job easier and more sane (with a
minimum of byte buffer copying.
2013-09-12 13:59:15 -07:00
eecc17ee67
WebSocket / cleaning up example
2013-09-12 12:23:53 -07:00
cda13d76d4
Adding example of websocket streaming read/write
2013-09-12 12:19:45 -07:00
0dcea8f2a2
Make sure client also has values set.
2013-09-12 10:49:30 -07:00
43c92f8117
416812 - Don't start WebSocketClient for every context
...
turn off for all contexts in demo
2013-09-12 20:44:13 +10:00
4b3541b7d1
WebSocket / making sure that filter always sees the correct target path, regardless of servlets
2013-09-11 08:56:19 -07:00
dc59080fca
WebSocket / Fixing pathmap matching when query parameters are provided
2013-09-11 07:24:25 -07:00
aa9aea00be
Adding back missing enable check, correcting javadoc
2013-09-09 19:04:55 -07:00
d3421070cb
Adding back ENABLE attribute for JSR-356
2013-09-09 19:01:23 -07:00
31ff31c8b1
Undo temporary change for memory testing reasons
2013-09-09 12:23:50 -07:00
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
b1b8e2b0a1
Adding Example for javax.websocket Client use
2013-09-09 10:08:58 -07:00
7e3ef36f16
Revert "416812 Only start WebSocketContainer if enabled by attribute"
...
This reverts commit a1cba900c5
2013-09-09 09:28:33 -07:00
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
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
a1cba900c5
416812 Only start WebSocketContainer if enabled by attribute
2013-09-09 12:27:15 +10:00
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
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
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
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
714bbf943a
Removing @ServerEndpoint caching, its just getting in the way
2013-09-06 12:28:33 -07:00
73f06c2a14
412205 - SSL handshake failure leads to unresponsive UpgradeConnection
...
+ Passing failure() back out of the UpgradeConnection
2013-09-03 13:15:04 -07:00
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
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
be2385276f
WebSocket / Fixing support for permessage-deflate extension
2013-08-28 11:49:54 -07:00
e5b4f37b62
renamed README.txt to README.TXT and updated contents
2013-08-29 00:32:36 +10:00
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
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
2e94149ea3
Merge branch 'jetty-9.1' into jetty-9.1-altstart
2013-08-23 11:49:41 -07:00
098b1e174b
WebSocket - making flush loop and callback notify more consistent
2013-08-23 10:57:05 -07:00
bddf536caa
fixed header
2013-08-23 20:07:05 +10:00
e4235ea070
415744 - Reduce Future usage in websocket
2013-08-23 19:58:46 +10:00
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
0032c1443d
add spdy and websocket mod
2013-08-22 13:23:29 -05:00
00e5daa37e
Adding some WebSocket examples
2013-08-21 11:13:45 -07:00
4d9cb44536
WebSocket - Calling setPayload() outside of ContinuationFrame
2013-08-20 16:51:11 -07:00
e56fddfc4a
WebSocket - Calling setPayload() outside of TextFrame and BinaryFrame
2013-08-20 16:45:26 -07:00
a089780701
WebSocket - Calling setPayload() outside of PingFrame and PongFrame
2013-08-20 16:39:26 -07:00
975d9870d2
WebSocket - more code cleanup
2013-08-20 16:28:51 -07:00
c6a4af4f78
WebSocket - cleaning up frame initialization and use
2013-08-20 15:45:07 -07:00
8c77fe2404
WebSocket - addressing bug in Partial message support
2013-08-20 15:31:12 -07:00
c548cba71c
WebSocket - fixing windowed parse issue with masked frames
2013-08-20 12:56:32 -07:00
34f03cb0e8
WebSocket / releasing (header) buffer acquired during generation
2013-08-20 09:57:57 -07:00
8e66da396e
Merge branch 'jetty-9.1-wssplitframe' into jetty-9.1
2013-08-19 15:27:09 -07:00
3dbcc04b73
Breaking apart WebSocketFrame into sub-frame types
...
+ Performance improvements?
+ Less copying of data
2013-08-19 15:26:07 -07:00
45724b63ec
Improved masking performance by using ints instead of bytes.
2013-08-19 22:11:52 +02:00
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
26faa5f0d7
WebSocket - fixing flush->write->complete spinning loop
2013-08-16 13:08:10 -07:00
4016ba571c
JSR-356 working javax.websocket demo in the distribution.
2013-08-15 12:20:06 -07:00
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
00d160a1c9
Merge branch 'release-9.1' into jetty-9.1
2013-08-14 14:37:19 -05:00
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
657e78aff2
[maven-release-plugin] prepare for next development iteration
2013-08-14 13:28:42 -05:00
590fae2bc4
[maven-release-plugin] prepare release jetty-9.1.0.M0
2013-08-14 13:28:32 -05:00
e39b48c90d
Fixing up javadoc issues in WebSocket classes
2013-08-14 10:54:07 -07:00
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
980effaede
WebSocket - reducing memory footprint of WebSocketFrame by not using boolean fields
2013-08-13 12:09:43 -07:00
176c7d22e4
JSR-356 - adding missing base Encoders
2013-08-13 12:09:43 -07:00
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
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
d3d4f7abed
WebSocket - quick fix to prevent jenkins test hang
2013-08-08 09:46:31 -07:00
5500f161d7
WebSocket - refining javadoc
2013-08-08 09:46:16 -07:00
baeda84402
WebSocket - fixing Frame.getPayloadLength()
2013-08-08 09:45:46 -07:00
eb0d7da7f2
JSR-356 Making PongMessage work with @OnMessage annotation
2013-08-06 13:15:13 -07:00
3e070f929e
JSR-356 addMessageHandler with Reader or InputStream should not NPE
2013-08-06 12:55:02 -07:00
12f6853900
WebSocket - enabling WebSocket on distribution
2013-08-06 09:20:02 -07:00
2354ad4c3d
Cleaning up javadoc
2013-08-06 09:19:49 -07:00
dfd3d5af29
WebSocket - refactoring bits and pieces to make testing easier.
2013-08-02 09:33:15 -07:00
ed95ffbfea
Fixed lifecycle management.
2013-08-02 15:05:50 +02:00
89b33f5b88
WebSocket - fixing message (buffer) size settings and checks
2013-08-01 16:06:44 -07:00
833aa6723d
WebSocket - More concurrency fixes found by FindBugs
2013-08-01 13:51:18 -07:00
07041f6439
JSR-356 making HTTP Header map use TreeMap(String.CASE_INSENSITIVE_ORDER)
2013-08-01 10:50:01 -07:00
cbaf68be20
Fixing license headers
2013-08-01 07:48:03 -07:00
11bb7431d2
JSR-356 some more tests
2013-08-01 07:47:14 -07:00
441c98544a
JSR-356 if mapping not found, allow default behavior
2013-08-01 07:47:02 -07:00
589b03d64c
Adding example on how to get the HttpSession into your socket.
2013-08-01 06:11:01 -07:00
e2f02a7a8a
JSR-356 fixing ServerContainer.setDefault*() method behavior
2013-07-31 14:25:54 -07:00
eb9fce2fa5
JSR-356: fixing Session.getProtocolVersion()
2013-07-31 13:41:46 -07:00
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
9846aee917
JSR-356 returning empty string (per javadoc) instead of null for Session.getNegotiatedSubprotocol()
2013-07-31 11:42:42 -07:00
153c844238
Adding Shutdown hook to ClientContainer
2013-07-31 10:48:23 -07:00
0fd0ecc887
JSR-356 - making ClientContainer a use jetty LifeCycle properly
2013-07-31 10:34:31 -07:00
8a2ccdf8ae
JSR-356 - fixing Session.setMax(Text|Binary)MessageBufferSize
2013-07-31 09:52:51 -07:00
0833d66dc6
JSR-356 - unwrapping connect exceptions better
2013-07-31 08:15:32 -07:00
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
28b3ee8b13
WebSocket - breaking out unfinished MUX extension into its own module
2013-07-30 15:09:40 -07:00
b63a6047d3
WebSocket - better protection on metadata cache
2013-07-30 14:42:08 -07:00
6fc7e23dc0
Testing for non-null
2013-07-30 14:41:28 -07:00
4d36627a63
JSR-356 fixing NPE on bufferPool
2013-07-30 14:32:41 -07:00
f8172e5a59
JSR-356 fixing calling of @OnMessage with partial message boolean
2013-07-30 14:27:48 -07:00
702b675e86
JSR-356 Fixing dispatching for Streaming reads
2013-07-30 12:49:04 -07:00
37feaea34b
JSR-356 adding support for javax.websocket.server.ServerApplicationConfig
2013-07-29 15:55:22 -07:00
b363400c84
JSR-356 - making SessionFactory additive to allow multiple impls at the same time.
2013-07-29 09:30:42 -07:00
e5655fc2cd
JSR-356 tweaking use of configureContext
2013-07-26 14:10:03 -07:00
6029826aa4
JSR-356 using Spec 6.4 properly for access to ServerContainer
2013-07-26 14:04:17 -07:00
6076e05bf6
JSR-356 fixing oddly worded exception
2013-07-26 14:04:17 -07:00
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
daac0e6784
JSR-356 Adding etc/jetty-websockets.xml for JSR configuration
2013-07-25 09:59:34 -07:00
b549410932
JSR-356 - Making WebSocketUpgradeFilter an attribute in the ServletContext
2013-07-25 09:43:47 -07:00
d7d4e415ea
JSR-356 - making use of ServiceLoader technique for finding Extensions
2013-07-24 14:46:59 -07:00
d967dafe45
JSR-356 - Refactoring Annotated method parameter detection and use
2013-07-24 12:32:15 -07:00
70a57f223f
Expanding EchoCase.toString
2013-07-24 12:32:15 -07:00
e69b41e9cd
JSR-356 Adding suppport for @PathParam
2013-07-16 16:56:03 -07:00
ba50e6b053
JSR-356 Adding echo tests on primitives
2013-07-16 14:05:59 -07:00
fb00eb55cd
JSR-356 Promoting ReflectUtils to websocket-common
2013-07-16 10:43:27 -07:00
05c5342752
JSR-356 Improving MessageHandler manipulation
2013-07-15 16:00:02 -07:00
9a8580b580
JSR-356 Improving Debugging of Annotated EventDrivers
2013-07-15 15:59:22 -07:00
2f01bdcdec
JSR-356 fixing javadoc describing class
2013-07-15 14:26:14 -07:00
179a78e502
JSR-356 Promoting UpgradeRequest.getUserPrinicpal() to API
2013-07-15 11:49:30 -07:00
6bd2f8fd3e
JSR-356 - Fixing StackOverflowError on Session.getProtocolVersion()
2013-07-15 11:39:56 -07:00
2362a4e8b3
JSR-356 - Handling ClientContainer.setMax(Text|Binary)MessageBufferSize better
...
+ The Jetty API is more configurable than the JSR, this forces the
Jetty side API to be consistent for whatever value the end user
specifies.
2013-07-15 10:43:39 -07:00
b3aee8e4d5
JSR-356 - fixing NPE on Extension.getParameters()
2013-07-15 10:43:39 -07:00
5d45486b8d
JSR-356 - Cleaning up sendObject(Object) behavior between Basic & Async
2013-07-15 10:43:39 -07:00
987aa846cc
398467 Servlet 3.1 Non Blocking IO
...
ensure that EOF is checked after all calls to nextContent
2013-07-15 14:28:22 +10:00
bd2add0ae9
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
2013-07-12 13:53:58 +10:00
ce37be598c
JSR-356 fixing Reader and Boolean parameter id detection.
2013-07-11 11:29:46 -07:00
495d2bcd74
JSR-356 - Fixing @OnMessage message format/decoder detection
2013-07-11 11:00:23 -07:00
022b8d4a12
JSR-356 - adding more examples of using Primitives for @OnMessage
2013-07-10 16:35:50 -07:00
5bb66f028a
Dialing back the logging level
2013-07-10 11:53:14 -07:00
33c11dffaa
JSR-356 - cleaning up Decoder and Encoder lifecycle.
2013-07-09 14:16:06 -07:00
46e9493c85
JSR-356 - reworked Config to maintain user provided config
...
+ If a user provided config is supplied, then that config should
be used for init(EndpointConfig) and other various accesses to
the configuration object. This refactor stops using an internal
EndpointConfig object always and moves the internal config
fields into the JsrSession object instead.
2013-07-09 14:16:06 -07:00
Simone Bordet
Joakim Erdfelt
Jesse McConnell
Greg Wilkins
Mikhail Mazursky
Jan Bartel