Simone Bordet
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
Michael Hausegger
5760795f96
Corrected license header information
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-17 14:26:58 +02:00
Michael Hausegger
d4ffef3de7
Added tests for UpgradeResponseAdapter
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-17 14:26:58 +02:00
Joakim Erdfelt
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
Michael Hausegger
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
Joakim Erdfelt
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
Joakim Erdfelt
54d8faf664
Updating WebSocket Examples seen in documentation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-10 09:08:59 -05:00
Joakim Erdfelt
9d159318f5
Issue #3616 - Backport of SessionTracker from Jetty 10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-01 10:47:08 -05:00
Joakim Erdfelt
205c4dc498
Merge pull request #3612 from eclipse/jetty-9.4.x-update-test-helper
...
Update testing
2019-05-01 05:40:24 -07:00
Lachlan Roberts
bb8e5557d2
fix flaky test ClientCloseTest.testWriteException
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-01 07:58:24 +02:00
Joakim Erdfelt
41ab9baf8c
Standardizing on hamcrest Matchers (not CoreMatchers from junit4)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 14:39:57 -05:00
Joakim Erdfelt
df716e1b23
Migrating away from junit5 deprecated isIn() to is(in())
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:33:28 -05:00
Joakim Erdfelt
c33f3a75ed
Merge branch `release-9.4.18` into `jetty-9.4.x`
2019-04-30 11:44:06 -05:00
Lachlan Roberts
8ddcf3685b
Issue #3608 - give 400 error response for missing Sec-WebSocket-Key
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-04-30 15:11:51 +04:00
Joakim Erdfelt
734be56938
Updating to version 9.4.19-SNAPSHOT
2019-04-29 16:27:23 -05:00
Joakim Erdfelt
e1bc35120a
Updating to version 9.4.18.v20190429
2019-04-29 15:40:33 -05:00
Joakim Erdfelt
29b960551f
Merge branch `release-9.4.17` into `jetty-9.4.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-bom/pom.xml
2019-04-25 09:15:42 -05:00
Joakim Erdfelt
13992d96e4
Merge pull request #3557 from lachlan-roberts/jetty-9.4.x-3476-websocket-concurrent-connect
...
Issue #3476 - previous WebSocketSessions being added to new connections
2019-04-25 06:55:00 -07:00
Joakim Erdfelt
05bb111580
Updating to version 9.4.18-SNAPSHOT
2019-04-18 15:59:49 -05:00
Joakim Erdfelt
aa1c656c31
Updating to version 9.4.17.v20190418
2019-04-18 14:44:28 -05:00
Lachlan Roberts
aeb9d2c5dc
Issue #3476 - previous WebSocketSessions being added to new connections
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-04-16 13:41:38 +10:00
Joakim Erdfelt
79537a5f51
Updating to version 9.4.17-SNAPSHOT
2019-04-11 11:00:24 -05:00
Joakim Erdfelt
e0aa4ae4c0
Updating to version 9.4.16.v20190411
2019-04-11 10:01:26 -05:00
Joakim Erdfelt
dd5c2e315f
Issue #3530 - Warning on attempt to use WebSocket Bootstrap on HTTP/2
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-08 12:05:39 -05:00
Simone Bordet
1b384329ae
Fixes #3526 - Request locale not retained in WebsocketUpgrade request.
...
Trivial fix, the locale was not copied from the HTTP requets to the
WebSocket upgrade request.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-05 17:50:41 +02:00
Simone Bordet
c4b2621f56
Merge pull request #3480 from eclipse/jetty-9.4.x-3464-split_sslcontextfactory
...
Issue #3464 - Split SslContextFactory into Client and Server
2019-04-02 12:39:37 +02:00
Lachlan Roberts
97ff7ed9c0
Issue #3106 - changes from review, adding javadoc
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-28 14:30:11 +11:00
Lachlan Roberts
45b2c548b0
Issue #3106 - backport WebSocket connection stats from jetty-10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-28 14:30:11 +11:00
Joakim Erdfelt
65528f76c5
Merge pull request #3467 from eclipse/jetty-9.4.x-3422-wss-close-wait
...
Issue #3422 - WebSocket wss CLOSE_WAIT on aborted client connection
2019-03-22 11:36:40 -05:00
Joakim Erdfelt
4eb8cb1686
Issue #3422 - Using new Connection.Listener support in websocket server
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-21 14:40:49 -05:00
Joakim Erdfelt
e56ef9d8f8
Backporting Connection.Listener support on WebSocket server connections from `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-21 14:37:41 -05:00
Simone Bordet
6fb243ff6c
Issue #3464 - Split SslContextFactory into Client and Server
...
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.
Refactored configuration checking so that warnings are not emitted
when non necessary.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-21 14:42:42 +01:00
Joakim Erdfelt
d7364e4794
Issue #3422 - Fixing testcase expectations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-15 14:08:33 -05:00
Joakim Erdfelt
4fb1940283
Issue #3422 - Fixing testcase expectation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-15 12:44:28 -05:00
Joakim Erdfelt
76de1c0f24
Issue #3422 - WebSocket wss CLOSE_WAIT on aborted client connection
...
+ Adding testcase to replicate
+ Fixing CLOSE_WAIT by issuing wsclose + disconnect on eof
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-15 11:52:14 -05:00
Greg Wilkins
76a37352f5
Issue #3440 Stop on Unavailable
...
+ revert schedulers to non-daemon threads for now so this PR can
proceed.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-12 09:21:19 +11:00
Greg Wilkins
375ad81f4b
Issue #3440 Stop on Unavailable
...
+ Any schedulers created are named (for ease of debug) and daemon
so they do not stop the JVM exiting.
+ If the server.doStart() fails, it calls server.doStop to ensure
connectors are stopped, ports are free etc.
+ cleanup of addBean handling of scheduler in proxy
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-07 15:10:53 +11:00
Joakim Erdfelt
438042e28b
Merge pull request #3418 from eclipse/jetty-9.4.x-3401-websocket-permessage-deflate-rsv1
...
Issue #3159 - Ensuring we follow permessage-deflate RSV1 rules in RFC7692
2019-03-04 09:26:47 -05:00
Joakim Erdfelt
6444446652
Issue #3159 - Ensuring we follow permessage-deflate RSV1 rules in RFC7692
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-01 16:56:29 -05:00
Joakim Erdfelt
160842805b
Issue #3389 - Fixing testcase expectation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-01 15:44:42 -05:00
Joakim Erdfelt
3bc3d7514d
Issue #3389 - missing willDecode calls in javax.websocket
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-01 14:12:21 -05:00
Joakim Erdfelt
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05:00
Joakim Erdfelt
eb70b24016
Updating to version 9.4.15.v20190215
2019-02-15 11:53:00 -05:00
Joakim Erdfelt
8dba440317
Issue #3279 - WebSocket Close Refactoring
...
+ FrameFlusher "close" frames are detected during
enqueue and sets the state properly for failing
other frames after it
+ Moving away from Blockhead(Client|Server) to using actual implementations
+ Moved tests to /jetty-websocket-tests/ to be able to use actual impl
for both sides of testcase (client and server)
+ Corrected FrameFlusher terminate/close to not fail the close frame
itself, but only frames that arrive AFTER the close frame.
+ Moving WebSocketCloseTest to jetty-websocket-tests to avoid
using BlockheadClient / BlockheadServer in testing
+ Cleanup of unnecessary modifiers on interface
+ Logging error if @OnWebSocketError is undeclared
+ IOState removed
+ New ConnectionState tracks connection basics in a simpler
method then IOState did.
+ No tracking of Remote close initiated (not needed)
+ IncomingFrames.incomingError() removed
+ Session delegates to Connection for all state changes
+ Errors can be communicated to application multiple times
+ Close is only communicated once
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-15 10:07:24 -05:00
Simone Bordet
6aa917080f
Issue #3347 - Fix race condition between onFillable() and resume().
...
Renamed Suspender -> ReadState.
Reworked the implementation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 16:15:07 +01:00
Shawn Smith
e16e836aa6
Fix race condition between onFillable() and resume()
...
Signed-off-by: Shawn Smith <shawn@thena.net>
2019-02-11 18:08:53 -06:00
Simone Bordet
88408375ab
Issue #3049 - Warn on common SslContextFactory problematic configurations.
...
Updating SslContextFactory configuration for tests, since
the change in the default endPointIdentificationAlgorithm
makes the test failing as the certificates are not valid
for the local host, which is different depending on where
the tests are run (locally, jenkins).
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-31 15:31:35 +01:00
Joakim Erdfelt
aa7f3bd071
Merge pull request #3245 from eclipse/jetty-9.4.x-issue-3242-websocket-dump-cleanup
...
Issue #3242 - WebSocket dump cleanup
2019-01-11 11:59:06 -06:00
Joakim Erdfelt
1b7ae00be3
Issue #3242 - Post-review cleanup of AbstractWebSocketConnection dump of EndPoint
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-11 11:27:10 -06:00
Joakim Erdfelt
478e5ac593
Issue #3242 - Post-review cleanup of WebSocket dump
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-11 10:16:46 -06:00