Joakim Erdfelt
dd8afc34b9
Merge branch 'jetty-9.3.x' into bugs/388
2016-06-06 08:37:36 -07:00
Joakim Erdfelt
8758cbb607
Fixes #388 - Provide pluggable RemoteEndpoint service
2016-06-06 07:44:46 -07:00
Joakim Erdfelt
80eefb5257
Improving WebSocketAdapter test reliability
2016-03-25 13:25:08 -07:00
Joakim Erdfelt
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
Joakim Erdfelt
64d5718e9e
Removing System.out
2015-10-02 10:43:47 -07:00
Joakim Erdfelt
5312f2c0d7
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
2015-08-27 15:34:45 -07:00
Joakim Erdfelt
25cfffbe1e
428474 - Expose batch mode in the Jetty WebSocket API
2015-08-27 14:53:21 -07:00
Joakim Erdfelt
ef067b2624
476023 - Incorrect trimming of WebSocket close reason
...
+ Fixed CloseStatus.trimMaxReasonLength() to perform trim correctly
+ Deprecated CloseStatus.trimMaxReasonLength() because it creates
to many objects
+ Removed use of CloseStatus.trimMaxReasonLength() in implementation
code
+ Improved CloseInfo ...
+ tracks reason via utf8 byte array (not String object)
+ trims utf8 byte array as-needed
+ All non-jsr implementations use CloseInfo logic
2015-08-27 11:12:51 -07:00
Joakim Erdfelt
744b9e4c62
466619 - Add WebSocketFrameListener for receiving WebSocket Frame information
...
+ Adding WebSocketFrameListener and example use case
2015-05-06 15:49:25 -07:00
Joakim Erdfelt
ecac4b4912
414479 - Add WebSocketPingPongListener for those that want PING/PONG payload data
...
+ Adding WebSocketPingPongListener and example case
2015-05-06 15:49:25 -07:00
Joakim Erdfelt
7e7b2e2950
420678 - Add WebSocketPartialListener to support receiving partial WebSocket TEXT/BINARY messages
...
+ Reworking WebSocketListener to be based on new
WebSocketConnectionListener
+ Adding new WebSocketPartialListener and example
2015-05-06 15:49:25 -07:00
Joakim Erdfelt
ed22d7e0de
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 16:11:01 -07:00
Joakim Erdfelt
09b5f680b7
464727 - Update Javadoc for Java 8 DocLint
...
Eliminate empty tag warnings
+ Changed <p/> to <p>
+ Changed <br/> to <br>
2015-04-15 14:38:35 -07:00
Joakim Erdfelt
10099dcb01
Marking Frame.isLast() as deprecated in favor of .isFin()
2015-04-15 14:38:35 -07:00
Greg Wilkins
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
Joakim Erdfelt
1f3097ff16
453834 - CDI Support for WebSocket
...
+ Adding scopes to websocket to help with CDI integration
2015-03-12 10:09:30 -07:00
Joakim Erdfelt
f7b382064f
457017 - Reflective call to websocket methods that fail have ambiguous
...
exceptions
+ Making JSR onOpen close and use onError properly, as well we
unwrapping the InvocationTargetException cause as to WHY the call to
onOpen failed.
2015-01-08 12:06:53 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -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
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
6802dbd75c
Cleaning up imports
2014-03-11 10:45:37 -07: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
Joakim Erdfelt
c1f547e2b3
Adding javadoc
2014-02-19 11:32:18 -07: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
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
Simone Bordet
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
Simone Bordet
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
Simone Bordet
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
Joakim Erdfelt
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
120e0e59ca
Cleanup (Imports / StandardCharset / Dead APIs)
2013-12-11 17:27:58 -07:00
Joakim Erdfelt
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
Greg Wilkins
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
Greg Wilkins
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
Greg Wilkins
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
Mikhail Mazursky
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
Joakim Erdfelt
6f1eb712e9
Cleaning up imports
2013-11-01 10:03:40 -07:00
Greg Wilkins
a3424532e8
fixed bad merge
2013-10-14 13:44:52 +11:00
Greg Wilkins
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
Joakim Erdfelt
180d9a55df
418792 - Session getProtocolVersion always returns null
...
+ Backporting just the getProtocolVersion from jetty 9.1
2013-10-07 16:45:21 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
be2385276f
WebSocket / Fixing support for permessage-deflate extension
2013-08-28 11:49:54 -07:00
Joakim Erdfelt
3dbcc04b73
Breaking apart WebSocketFrame into sub-frame types
...
+ Performance improvements?
+ Less copying of data
2013-08-19 15:26:07 -07:00
Joakim Erdfelt
e39b48c90d
Fixing up javadoc issues in WebSocket classes
2013-08-14 10:54:07 -07:00
Joakim Erdfelt
980effaede
WebSocket - reducing memory footprint of WebSocketFrame by not using boolean fields
2013-08-13 12:09:43 -07:00
Joakim Erdfelt
1e39b7d476
WebSocket / Performance - cleaning up tests from fallout on bug 414913
...
+ Copying payload in test cases for comparison reasons, as the reuse of
payloads by the implementation now means that the payload might be
masked by a random client side mask.
+ Cleaning up Abnormal Close handling for idle timeout cases
+ Fixing logging a tag
+ Fixing intermittent test failure in jsr EchoTest
2013-08-12 16:29:25 -07:00
Joakim Erdfelt
46b3dc10c8
414913 - WebSocket / Performance - reduce ByteBuffer allocation/copying during generation/writing
...
+ Splitting Header bytes from payload bytes.
+ returning List<ByteBuffer> from WriteBytesProvider now
+ returning possibly more than 1 frame per
WriteBytesProvider.getByteBuffers() for submission to
Endpoint.write()'s gathered write of multiple bytebuffers
2013-08-12 16:29:25 -07:00
Joakim Erdfelt
dfd3d5af29
WebSocket - refactoring bits and pieces to make testing easier.
2013-08-02 09:33:15 -07:00
Joakim Erdfelt
89b33f5b88
WebSocket - fixing message (buffer) size settings and checks
2013-08-01 16:06:44 -07:00