85aa3424b6
Issue #3712 - rename maxIdleTime usage to idleTimeout for WebSockets
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-05 14:18:47 +10:00
90e849af76
disable failing testSuspendAfterClose for further review
...
the WebSocket suspend after close different behaviour from 9 to 10
in jetty-10 an ISE is thrown
in jetty-9 it is a no-op
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-05 13:30:21 +10:00
edcaa4eda7
rename writeIdleTimeout to writeTimeout for javax websockets
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-05 01:48:26 +10:00
bb65167549
Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-05 01:34:53 +10:00
f282ba4758
Merge pull request #3686 from lachlan-roberts/jetty-10.0.x-3666-errorClose
...
Issue #3666 - error CloseFrames skip frames in the FrameFlusher queue
2019-06-04 13:43:54 +10:00
ac8303c45e
Merge pull request #3637 from lachlan-roberts/jetty-9.4.x-3498-websocket-suspend
...
Issue #3498 - jetty 9.4 websocket suspend for incoming frames
2019-06-04 13:42:24 +10:00
6681da7e74
Issue #3666 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-03 11:18:41 +10:00
567c5a4f55
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-05-30 12:49:47 +02:00
0cf91c91e1
Issue #3696 - Unwrap JavaxWebSocketClientContainer.connectToServer() exceptions.
...
Improved exception unwrapping.
Code cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-29 19:21:00 +02:00
3d20d9c51a
Merge branch 'jetty-10.0.x-3696-connectToServer-ExecutionException' of https://github.com/lachlan-roberts/jetty.project into lachlan-roberts-jetty-10.0.x-3696-connectToServer-ExecutionException
2019-05-29 19:02:59 +02:00
fdcbb214f8
Added tests for decoders
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-29 17:43:19 +02:00
564ac4a2d3
Added Unit Tests for ReflectUtil.
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-29 17:09:45 +02:00
3e0e6a73c7
Some fixes for running cometd6 on jetty-10 ( #3702 )
...
* Some fixes from testing cometd-6
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-28 17:08:38 +02:00
77d95d039c
Issue #3696 - unwrap ExecutionException in javax WS connectToServer
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-28 11:55:31 +10:00
49356bb5c5
Merge pull request #3660 from lachlan-roberts/jetty-10.0.x-configuration-refactor
...
jetty-10 WebSocket configuration refactor
2019-05-24 10:40:30 +10:00
e5a6910be4
Issue #3666 - changes from review
...
- code cleanups
- made SHUTDOWN 1001 status an abnormal close status
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-24 05:58:02 +10:00
9e09f76fda
Issue #3666 - error CloseFrames skip frames in the FrameFlusher queue
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-24 05:54:49 +10:00
68fa24e463
fix bad merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-23 16:31:02 +10:00
19e80ff788
Merge pull request #3685 from lachlan-roberts/jetty-10.0.x-83-sessiontrackingtest-failures
...
Issue #83 - reworked SessionTrackingTest to fix intermittent failures
2019-05-23 16:10:30 +10:00
d377db5d26
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-05-23 14:18:39 +10:00
d6c68c4911
Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-configuration-refactor
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-23 09:03:27 +10:00
52cc4f6c22
Issue #83 - reworked SessionTrackingTest to fix intermittent failures
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-22 17:16:52 +10:00
f4990dd0f5
prefer the field and variable name of coreSession instead of session
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-22 08:29:05 +02:00
491ff5eb93
rename WebSocketChannel to WebSocketCoreSession
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-22 08:29:05 +02:00
5f62e0f2db
store shared websocket components as attributes and not beans
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-21 18:56:53 +10:00
e31009cb06
WebSocketCoreClient no longer stores configuration and can be shared
...
configuration moved to ClientUpgradeRequest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-21 11:33:06 +10:00
3af45f4c89
Merge pull request #3665 from eclipse/jetty-9.4.x-3663-remove-deps-in-wsclient-with-httpclient
...
Issue #3663 - Remove @Deprecation's from WebSocketClient
2019-05-20 10:55:43 +02:00
5760795f96
Corrected license header information
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-17 14:26:58 +02:00
d4ffef3de7
Added tests for UpgradeResponseAdapter
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-17 14:26:58 +02:00
0b41386c0d
don't allow custom CoreClients to be supplied to JavaxClientContainer
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-17 16:54:09 +10:00
0eb90e41d1
Issue #3663 - Remove @Deprecation's from WebSocketClient
...
+ Those methods and constructors that had @Deprecation assigned
that urged the use of HttpClient directly are no longer
annotated as deprecated because of legitimate possibility of
a valid LinkageError
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-16 09:48:28 -05:00
4f90eb6533
Added Unit Tests to increase code coverage.
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-16 08:25:34 +02:00
c40a303e2c
allow live configuration of maxMessageSizes on JettyWebSocketSession
...
and set the configuration on supplied CoreClient to the Javax client container
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-16 15:50:20 +10:00
a115e92029
move maxMessageSize configuration from javax framehandler to session
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-16 15:43:38 +10:00
455cc3d2e2
improvements to the jetty-websocket configuration testing
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-16 15:43:22 +10:00
c68a1b6066
fix the websocket configuration problems shown by ClientConfigTest
...
correctly detect when a message has exceeded the max size in the sink
forward changes to the input buffer size to the connection in WSChannel
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-16 15:38:33 +10:00
7019c18117
refactor of javax WebSocketContainer configuration
...
the client and server subclasses of JavaxWebSocketContainer now
share a common configuration instance which is used as the default
configuration for both server and client endpoints
to do this a setter was added for the configuration on the CoreClient
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-16 15:38:12 +10:00
7ba77c0be4
add tests for jetty-websocket client configuration
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-16 15:37:46 +10:00
7e5dcda708
force websocket idle timeout default to be set on endpoint
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-15 12:39:04 +02:00
2782344d4c
revert ConfigurationCustomizer change from #3374
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-15 12:39:04 +02:00
b44ecc932a
Issue #2909 - Replace B64Code with java.util.Base64
...
+ Deprecated B64Code
+ All code that isn't B64CodeTest is now using java.util.Base64
+ B64CodeTest is updated to confirm change to java.util.Base64
is possible without change in behavior. Just have to make
sure you use the appropriate Encoder / Decoder for the task
at hand (default vs mime vs url)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-15 10:08:11 +02:00
c578798370
Fixes #3197 - Use jetty specific websocket API jar.
...
Introduced jetty-javax-websocket-api artifact with proper
OSGi manifest entries and JPMS Automatic-Module-Name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-10 19:33:12 +02:00
54d8faf664
Updating WebSocket Examples seen in documentation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-10 09:08:59 -05:00
5f4c6c3b94
Issue #3374 - comments, name changes and fixes to timeout algorithm
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-05-09 00:05:57 +02:00
1ef191ffcd
Issue #3374 - websocket write timeout improvements
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-09 00:05:57 +02:00
92e38fcb42
Issue #3374 - implementation of write timeouts for websockets
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-09 00:05:57 +02:00
cb50d6f9aa
Issue #3498 - fix suspend implementation to suspend WebSocket frames
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-05-08 12:28:29 +10:00
a305660c54
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-server/src/main/config/etc/jetty-ssl-context.xml
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-05-07 13:54:27 -05:00
b6d6c83bf1
Issue #3382 - changes from review
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-05-07 09:26:36 +02:00
ec88316116
Issue #3382 - improve testing for WS suspend and fix demand on resume
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-05-07 09:26:36 +02:00
Lachlan Roberts
Simone Bordet
Michael Hausegger
Greg Wilkins
olivier lamy
Joakim Erdfelt