dc74bcf4cc
throw ISE if WebSocketSCI.configure() is called on started ServletContextHandler
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 14:55:07 -05:00
4cb475c97d
Issue #5320 - also test WebSocketClient on server from WEB-INF/lib
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 16:15:57 +11:00
1b07c846c6
Issue #5320 - use HttpClient classloader to load jetty-websocket-httpclient.xml
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 16:15:20 +11:00
6cd70ce136
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5320-WebSocketHttpClient
2020-10-15 14:12:21 +11:00
be041d3044
Issue #5368 - add tests for not reading to end of InputStream
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 12:10:33 +11:00
680020dcb2
Issue #5368 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-15 12:08:57 +11:00
4690aa51ba
allow override of shared CompressionPools in WebSocketServerComponents
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
0e3cfe8fc2
Issue #5287 - share compression pools and size with max num threads
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
608a895aab
Issue #5287 - make default CompressionPool capacity 1024
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
5dc0242986
Issue #5287 - Changes from review & fix broken tests from NPE
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
21576f2312
Issue #5287 - fix usages of new CompressionPool
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 22:28:26 +11:00
419eefc2ef
move logic from messageComplete into appendFrame with fin==true
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-14 10:26:08 +11:00
1cd15e8d85
Fixes #5379 - Better handling for wrong SNI. ( #5398 )
...
* Fixes #5379 - Better handling for wrong SNI.
Reworked the SNI logic.
Added support for IP addresses in the SAN extension of certificates in the X509 class.
Fixed keystores to have CN=localhost and SAN with ip=127.0.0.1 and ip=[::1].
Fixed tests that were not using the correct Host header.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-10-12 15:48:53 +02:00
dfa076fdb5
Merge pull request #5403 from eclipse/jetty-10.0.x-5401-move-httptester
...
Move HttpTester to jetty-http
2020-10-12 06:14:44 -05:00
94bafba6ac
simplify the usage of WebSocketUpgradeFilter
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-09 17:31:41 +11:00
7003b3c42e
Issue #5378 - guard against concurrent requests lazily initializing the filter
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-08 08:46:51 +11:00
2a4d672fc1
Issue #5378 - improve testing for WebSocketUpgradeFilter
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-08 08:46:51 +11:00
857e888e8b
Issue #5401 - Move HttpTester to jetty-http
...
+ leaving jetty-http-tools alone
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-07 14:50:31 -05:00
09947681fe
allow MessageInputStream to read multiple bytes at a time
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-07 19:48:13 +11:00
aa1299912d
Issue #5368 - when resuming always call onFillable from newThread.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-07 16:32:06 +11:00
7df0dfa7c2
warn if did not read until EOF once per MessageInputStream
2020-10-07 15:41:51 +11:00
6c94ef5848
Issue #5368 - warn if MessageInputStream closed without fully consuming
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-06 17:43:58 +11:00
a91a7630e0
fix NPE from contextClassLoader in XmlBasedHttpClientProvider
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-01 17:40:37 +10:00
941ffcead7
Issue #5368 - ensure onMessage exits before next frame is read
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-01 15:42:50 +10:00
81c88cdde0
Issue #5320 - do all exception handling in XmlBasedHttpClientProvider
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-01 14:03:25 +10:00
5b96f6f984
Issue #5320 - Run jetty-websocket-httpclient.xml with server class access.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-10-01 12:38:17 +10:00
85e257fc98
Updating to version 9.4.33-SNAPSHOT
2020-09-30 11:53:09 -05:00
de97d26f7b
Updating to version 9.4.32.v20200930
2020-09-30 11:03:24 -05:00
00f05cb94e
Issue #5320 - reproduce failure to load httpClient for WebSocketClient in webapp
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-30 15:11:05 +10:00
ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-09-29 11:24:28 -05:00
3423375a97
Issue #5357 - Updating to https://eclipse.org/ ( #5358 )
...
* Issue #5357 - Updating to https://eclipse.org/
- Removing redundant <url> refs in pom.xml
- Correcting bad indenting from merge
- Correcting mailing list references
- Correcting bugs.eclipse.org references
- Correcting text file references
- Correcting html references
- Correcting further references
- Correcting download.eclipse.org reference
- Adding test for demo-base /proxy/current/
- Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 11:02:32 -05:00
a55ddc2093
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-25 13:28:41 +10:00
70c8822eef
Updated module descriptions for consistency. Resolves #5313
2020-09-23 13:10:47 -05:00
5d951e840e
fix licence header and checkstyle
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-23 10:34:50 +10:00
2f3808026f
Issue #5170 - add testing to verify if this issue exists in 9.4.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-22 18:23:55 +10:00
76cf6c8bdc
Merge pull request #5266 from eclipse/jetty-10.0.x-WebSocketAutoBahn
...
Issue #5170 - fix upgrade bug in HttpReceiverOverHTTP
2020-09-16 16:39:54 +10:00
9be277a810
debug log full stacktraces only in processConnectionError and processHandlerError
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-15 16:50:24 +10:00
14e6bd196e
update javadoc for JDK MethodHandles bug tests, stop stacktrace in DistributionTests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-14 17:28:57 +10:00
c9cd27ee4d
Issue #5170 - fix upgrade bug in HttpReceiverOverHTTP
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-14 15:09:00 +10:00
48a8e2fca5
Improve test to reliably reproduce issue seen in the AutobahnTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-14 14:44:38 +10:00
dd72e85b6a
improvements to websocket-core logging to reduce duplicate stacktraces
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-14 14:07:20 +10:00
5d1d7c9c26
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-09-10 10:55:34 +10:00
609f0b2159
Merge branch 'jetty-10.0.x-4824-WSmaxOutgoingFrames' into jetty-10.0.x
2020-09-10 10:51:57 +10:00
b44b62038c
reorder methods for maxOutgoingFrames, fix javadoc
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-10 09:50:52 +10:00
b7fb631b2d
Merge remote-tracking branch 'origin/jetty-9.4.x-4824-WSmaxOutgoingFrames' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-10 09:48:39 +10:00
4fd7920143
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-4824-WSmaxOutgoingFrames
2020-09-10 09:46:12 +10:00
4023944d6d
fix ServiceLoader file for ExtensionConfig.Parser
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-07 10:37:04 +10:00
b5810b930d
Issue #5824 - improve javadocs for RemoteEndpoint maxOutgoingFrames
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-04 17:43:36 +10:00
7082e2086a
cleanups in Jetty WS API
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-04 17:08:44 +10:00
8bbea55ed9
remove the extensions package as extensions are now written in websocket-core
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-04 16:44:23 +10:00
8492697ae0
move Jetty WS API exceptions to separate package
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-04 16:40:16 +10:00
52c9f8730b
Issue #4824 - create test for WebSocket maxOutgoingFrames
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-04 10:45:47 +10:00
f788260abd
Issue #4824 - use WritePendingException instead of IOException
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-03 14:58:09 +10:00
466ec0c2d5
Disabled tests broken in Java 15 due to a JVM bug.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-09-02 18:52:10 +02:00
cdb12b4130
Merge pull request #5213 from eclipse/jetty-10.0.x-5170-HttpUpgradeBuffer
...
Issue #5170 - fix NPE during websocket upgrade
2020-09-02 18:00:19 +10:00
43f41ae046
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-09-02 15:48:25 +10:00
576b1e2323
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-4824-WSmaxOutgoingFrames
2020-09-02 10:07:19 +10:00
5bdcea2a49
change log warning for fillAndParse errors to debug log
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-09-02 09:55:18 +10:00
ae62180416
Issue #5170 - ensure bytes after 101 response isn't lost during upgrade
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-31 18:29:28 +10:00
cd1edb33f4
Merge remote-tracking branch 'origin/jetty-9.4.x-5193-better-websocket-event-logging' into jetty-9.4.x-5193-NullMessage
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-31 10:53:26 +10:00
46402bc382
Issue #5193 - Updating logging per review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-28 05:46:07 -05:00
92e5abb1bd
add missing licence header in SingleOnMessageTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-27 18:05:56 +10:00
478bcdc868
Issue #5193 - fix lost message bug when using single onMessage annotation
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-27 17:18:48 +10:00
eebb47cbc5
add test to reproduce issue #5193
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-27 17:14:01 +10:00
1690e9d30d
Issue #5193 - Adding more EventDriver logging
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-26 06:56:17 -05:00
77779ed6d8
Issue #4996 - Regularlize logging ( #5167 )
...
* Issue #4996 Regularize logging
Signed-off-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-24 17:15:13 +02:00
35f3f1886e
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-08-19 09:39:31 +10:00
37a8e44347
fix WebSocketStatsTest numMessages back to 1000
...
Remove server getConnections check after client open event
as the server connection may not be open yet.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-19 09:36:56 +10:00
7d6f692721
disable autoFragment for WebSocketStatsTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-19 09:32:54 +10:00
931e10458a
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-08-19 08:34:39 +10:00
cfd31b2cf5
Merge pull request #5125 from eclipse/jetty-9.4.x-5122-WebSocketStats
...
Issue #5122 - Improve connection statistics for WebSocket
2020-08-19 08:04:47 +10:00
1663a6d7af
Issue #5125 - Generalise WebSocketConnectionStatistics into IncludeExcludeConnectionStatistics
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-14 15:19:06 +10:00
de1077c375
Fix WebSocketServerExamplesTest to work with surefire update
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-13 22:04:56 +10:00
cbd4c38f3d
Issue #5121 - always use isDebugEnabled() check before debug logging in WebSocket ( #5123 )
...
* Issue #5121 - always use isDebugEnabled() check before logging in CompressExtension
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #5121 - always use isDebugEnabled() check before debug logging
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #5121 - always use isDebugEnabled() check before debug logging in WebSocket
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-11 11:51:39 +02:00
c198d26e6b
Updating to version 10.0.0-SNAPSHOT
2020-08-11 16:47:55 +08:00
429b091578
Updating to version 10.0.0.beta1
2020-08-11 16:47:54 +08:00
8a3ff775d5
Issue #5122 - make number of active WS Sessions a managed attribute on SessionTracker
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-06 20:45:06 +10:00
be429f0910
Issue #5122 - add specialized Connection.Listener for WebSocket ConnectionStatistics
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-06 20:38:02 +10:00
1e7ce3ac1e
Merge pull request #5101 from eclipse/jetty-10.0.x-5044-WebSocketUpgradeRequestResponse
...
Issue #5044 - Refactor of Jetty WebSocket Upgrade Request/Response
2020-08-06 09:11:12 +10:00
fd5c07eceb
removed dangling javadoc comment
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-06 08:25:40 +10:00
11db6f9d71
Merge pull request #5115 from eclipse/jetty-10.0.x-5096-lazyUpgradeFilter
...
Issue #5096 - lazily initialize the WebSocketFilter if only using JettyWebSocketServlet
2020-08-05 09:37:42 +10:00
c49035570e
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-convert_synchronized_to_autolock'.
2020-08-04 16:32:55 +02:00
dbeac5eb49
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-04 20:37:12 +10:00
9cde41a75c
Issue #5096 - add WebSocketFilter lazily if only using JettyWebSocketServlet
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-03 19:01:41 +10:00
85c4fc5335
Issue #5108 - use set based on ConcurrentHashMap and remove synchronized blocks
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-03 18:26:14 +10:00
d37501dce0
Issue #5108 - use HashSet for SessionTrackers to improve scalability
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-03 10:40:12 +10:00
ce8cb063ea
Issue #5044 - extend Jetty WS API Request/Response interfaces for jetty-websocket-server
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-30 17:34:17 +10:00
3074aa7fae
Issue #5044 - Jetty Server upgrade request/response now implement the API interfaces
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-30 13:28:39 +10:00
9027e17095
Issue #5044 - rename the ClientUpgradeRequest to CoreClientUpgradeRequest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-30 12:51:42 +10:00
089e51f0bc
Fixes #5083 - Convert synchronized usages to AutoLock.
...
Updates after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-29 15:34:01 +02:00
414a0f35f9
Issue #5044 - move all setter methods on the UpgradeRequest interface to ClientUpgradeRequest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-29 22:44:42 +10:00
5ff0ce4142
Issue #5044 - implement is secure on DelegatedJettyClientUpgradeRequest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-29 22:22:14 +10:00
1be0220988
Issue #4919 - make the SessionTracker the one to implement Graceful shutdown
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-28 17:38:41 +10:00
9e383f0891
Issue #4919 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-28 16:48:49 +10:00
8d69fc41a7
Fixes #5083 - Convert synchronized usages to AutoLock.
...
* Replaced relevant usages of synchronized with AutoLock.
* Made AutoLock serializable since classes that use it may be stored in the HttpSession.
* Added convenience methods to AutoLock to execute lambdas with the lock held.
* Introduced AutoLock.WithCondition to use a Lock and a Condition together.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-27 23:14:05 +02:00
e13d26ab45
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4919-WebSocketContainerStop
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-24 13:39:07 +10:00
fe9deae849
Updating to version 9.4.32-SNAPSHOT
2020-07-23 13:53:47 -05:00
450ba27947
Updating to version 9.4.31.v20200723
2020-07-23 12:46:54 -05:00
d5cf429537
fix websocket tests from merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 12:17:20 +10:00
e77c253267
Issue #5018 - fix merge to jetty-10, WSClient.connect Future should fail upgrade
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 11:17:05 +10:00
5726fa9364
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 10:19:53 +10:00
d8b775c0fb
Merge pull request #5030 from eclipse/jetty-9.4.x-5018-WebSocketClientConnectFuture
...
Issue #5018 - cancellation of WebSocketClient.connect Future should fail upgrade
2020-07-23 08:36:12 +10:00
25a2326221
Merge pull request #5054 from eclipse/jetty-10.0.x-5043-AnonymousWebSocketListener
...
Issue #5043 - allow anonymous WebSocketListener / Endpoint classes to be used
2020-07-22 14:49:48 -05:00
695d239ac5
Issue #4919 - all websocket containers to implement Graceful shutdown interface
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 00:09:43 +10:00
965e73e9e9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-20 12:01:53 +02:00
9f7f2e3e56
WebSocket server now only closes gracefully if the Server stopTimeout is set
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-20 15:49:15 +10:00
0818f54be8
cleanup the ws javax EchoSocket test class
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-20 15:32:46 +10:00
6125a07a63
Issue #5053
...
removed weak random from Masker.
2020-07-17 17:59:57 +02:00
f6d39849e8
Improves #5053 by giving option of secure or pseudo random
...
Allow random to be passed in and can default to a weak pseudo random.
2020-07-17 12:19:22 +02:00
c94e82470d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4919-WebSocketContainerStop
2020-07-17 15:32:10 +10:00
beca81c990
Fixes #5053 CWE-331 ( #5056 )
...
Replace uses of Random with SecureRandom.
We do not believe any of these uses of Random represent any security vulnerability, but we are making this
change for an abundance of caution and to avoid warnings from 3rd party scanning tools.
2020-07-16 15:31:19 +02:00
0a30525653
Issue #5043 - allow WebSocketListener / Endpoint anonymous classes to be used
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 12:44:54 +10:00
00777fe05a
Issue #5043 - add testing for WebSocketListener / Endpoint as anonymous classes
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 12:21:03 +10:00
fc473f3368
Merge pull request #5031 from eclipse/jetty-10.0.x-5018-WebSocketClientRequestTimeout
...
Issue #5018 - add WebSocketClient UpgradeRequest timeout to jetty 10
2020-07-16 09:19:47 +10:00
c09e4d6f86
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 08:46:29 +10:00
860cba7877
Use Consumer<NativeWebSocketConfiguration> in ConnectFutureTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 07:45:16 +10:00
f9750c9632
Test aborting with exception before WS upgrade completes.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 19:21:01 +10:00
de1b6745c5
the DO NOT EDIT comment in .mod files should start with '#'
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 16:47:22 +10:00
25a7da2635
add test for abort with CompletableFuture.completeExceptionally()
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 21:47:31 +10:00
664cf5fb52
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5018-WebSocketClientConnectFuture
2020-07-14 21:21:08 +10:00
9c910e9413
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 18:09:40 +10:00
145dcf502c
cleanups after merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 16:52:50 +10:00
df34a6269b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5018-WebSocketClientRequestTimeout
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 16:39:23 +10:00
7b05567b52
Issue #4808 - Review HttpClient Request header APIs.
...
For some reason, Request.getHeaders() returned HttpFields,
but HttpRequest.getHeaders() returned HttpFields.Mutable,
and it was obviously wrong.
Fixed WebSocket code that was relying on this API error.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-13 16:44:07 +02:00
fc0f4b28f9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-13 15:06:09 +10:00
ca404f157f
clean up and rename fields in EventSocket WebSocket test utility class
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-13 14:53:55 +10:00
eefe3d202b
revert fail release
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:04:22 +10:00
9619a5a743
Updating to version 10.0.0.beta1
2020-07-10 14:23:28 +10:00
aaeffb719e
Updating to version 10.0.0-SNAPSHOT
2020-07-09 12:25:34 +10:00
23c99ffdbe
Updating to version 10.0.0.beta1
2020-07-09 11:20:55 +10:00
25d7b99ba1
Issue #5018 - add WebSocketClient UpgradeRequest timeout to jetty 10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-09 08:11:05 +10:00
a179535db3
Issue #5018 - add WebSocketClient UpgradeRequest timeout to jetty 10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-08 18:04:36 +10:00
c716edd7a2
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-08 17:35:13 +10:00
d7c47f42d6
Issue #5018 - add testing for WebSocketClient Future cancellations
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-08 16:48:43 +10:00
794d67c4d6
Merge pull request #5024 from eclipse/jetty-9.4.x-5018-ClientUpgradeRequestTimeout
...
Issue #5018 - add request timeout onto ClientUpgradeRequest
2020-07-08 16:36:07 +10:00
13297d5bd7
Issue #5018 - cancellation of WebSocketClient.connect Future should fail upgrade
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-08 16:20:27 +10:00
702a48c2d1
Issue #5018 - rename ClientUpgradeRequest timeout to setTimeout
...
and increase timeouts used for testing
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-07 22:05:01 +10:00
74916c2fc9
Issue #5018 - add test case for ClientUpgradeRequest timeout
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-07 16:38:51 +10:00
ba6a6ea67d
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-07-06 23:10:19 +02:00
f2c6b67827
Fixes #4971 - Simplify Connection.upgradeFrom()/upgradeTo(). ( #5008 )
...
Fixes #4971 - Simplify Connection.upgradeFrom()/upgradeTo().
Now the upgrade-from connection produces a "floating" buffer
(not belonging to a pool), so that it can release the original buffer.
The upgrade-to connection is free to copy or store this "floating" buffer.
Strengthened ByteBufferPool behavior when releasing non-pooled
ByteBuffers: the buffer is now discarded.
Updated javadocs and all implementations.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-06 22:45:03 +02:00
33852f5137
Merge pull request #4912 from eclipse/jetty-10.0.x-4907-suspendAfterCloseRace
...
Issue #4907 - close websocket suspendState if close frame is received
2020-07-06 12:54:39 +10:00
fbe3803cd1
fix checkstyle issue
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-06 12:19:38 +10:00
6a8a6efd1c
Issue #5018 - add request timeout onto ClientUpgradeRequest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-04 11:37:45 +10:00
32b29a3ced
fix DecoderListsTest and cleanup code
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-30 11:18:36 +10:00
4fdf52bd55
Issue #3428 - changes to AbstractDecodedMessageSink signature from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-29 20:34:18 +10:00
acf47624a3
Issue #3428 - make AvailableDecoders only allow registration through EndpointConfig
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-29 19:01:00 +10:00
eb01603abb
Issue #3428 - improve testing and ensure decoders are registered in correct order
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-29 18:41:54 +10:00
5da4d7e460
Issue #3428 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-29 15:37:47 +10:00
35e82c85ff
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3428-decoderLists
2020-06-29 11:33:03 +10:00
22d5321628
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-06-23 10:04:58 +10:00
0db20886d0
Issue #1100 - ensure init and destroy are always called on JSR356 Encoders
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-22 11:51:06 +10:00
a03a352d79
Issue #1100 - replicate issue where Encoder init and destroy never called
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-22 11:21:46 +10:00
ed9c60fc90
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4919-WebSocketContainerStop
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-16 18:57:40 +10:00
50b62c3771
Issue #4907 - merge synchronized blocks for suspendState
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-16 18:09:29 +10:00
25c54668f4
fix license header
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-06-13 20:43:21 +10:00
6795f3915f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-06-12 12:04:50 -05:00
6df6fa33b8
Updating to version 9.4.31-SNAPSHOT
2020-06-11 08:24:34 -05:00
271836e4c1
Updating to version 9.4.30.v20200611
2020-06-11 07:21:18 -05:00
66ef0ebc03
Issue #4903 - do ServerEndpointConfig validation check before started
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-11 19:20:49 +10:00
f41f601e19
Issue #4903 - fix validation on custom Configurator annotated endpoint
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-11 09:58:49 +10:00
b22e306796
Issue #4903 - Improved behavior for Custom ServerEndpointConfig.Configurator
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-06-10 17:03:26 -05:00
9bfc168329
Issue #4903 - Improved behavior for Custom ServerEndpointConfig.Configurator
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-06-10 11:01:30 -05:00
5fc90cc6db
fix websocket JPMS warnings and build issues
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-10 00:36:49 +10:00
9423a8753e
fix some websocket jpms errors
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-02 16:10:48 +10:00
bebe6fd138
Issue #4919 - always stop SessionTracker before closing connections
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-02 15:37:55 +10:00
753c8be6eb
Issue #4919 - test graceful stop for jetty and javax ws containers
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-06-02 15:32:36 +10:00
f2dec1946d
Issue #4903 - give better errors for non public javax.websocket endpoints jetty-10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-28 12:25:47 +10:00
2c1c25d5a7
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3428-decoderLists
2020-05-28 10:29:53 +10:00
1690f69f36
Issue #3428 - improve testing & warn if no decoder accepts message
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-28 10:21:28 +10:00
277561e48b
Issue #4907 - moved to close state if any close frame is received
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-27 10:10:12 +10:00
0b8306976a
Merge pull request #4906 from eclipse/jetty-9.4.x-4903-WebSocketPublicModifier
...
Issue #4903 - give better errors for non public javax.websocket endpoints
2020-05-27 09:43:24 +10:00
a11c7f554c
Issue #4903 - cleanup catch statement from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-27 09:42:44 +10:00
5c63b0ef78
Issue #4903 - catch Throwable instead of RuntimeException
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-26 17:37:04 +10:00
d8fb116e12
Issue #4907 - close suspendState if response close frame is received
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-26 17:13:16 +10:00
c41560c7cd
Issue #4903 - add cause to Exception when creating endpoint instance
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-26 15:35:39 +10:00
470d948504
Issue #4903 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-26 09:35:17 +10:00
add00c9dd8
Issue #4903 - check endpoint class is default constructable
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-25 13:57:41 +10:00
28a588b8bd
Issue #4903 - Better errors for non public endpoints
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-25 12:36:09 +10:00
5d6f3e2ddc
Updating to version 9.4.30-SNAPSHOT
2020-05-21 13:42:25 -05:00
77c232aed8
Updating to version 9.4.29.v20200521
2020-05-21 12:04:14 -05:00
9475662451
Issue #3428 - add validation checks when adding decoders
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-21 18:44:46 +10:00
43e3cdc4e3
Issue #3428 - cleanups and simplify MessageHandler registration
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-21 14:58:46 +10:00
8e554c7d13
Issue #3428 - fix decoder list matching to get test working
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-21 08:52:01 +10:00
4b19c19815
Issue #3428 - Initial refactor to support javax websocket decoderLists
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-19 22:45:37 +10:00
dacd5e7e36
fix websocket-core-test pom.xml file
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-14 16:02:21 +10:00
f1815b6938
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketCoreRefactor
2020-05-14 14:27:30 +10:00
7d80c8fc39
Add constructor to better align with 10.0.x
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-05-13 17:38:43 +02:00
8b489806b6
Fix osgi issues in websocket-core-common
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-12 17:00:30 +10:00
11d14a65b4
Issue #2173 & #2174 - Split websocket-core into client/server/common modules
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-12 15:10:44 +10:00
0018c298dc
Merge pull request #4845 from eclipse/jetty-10.0.x-4808-review_httpclient_header_api
...
Fixes #4808 - Review HttpClient Request header APIs.
2020-05-08 17:52:51 +02:00
2e1c01ac8c
Merge pull request #4723 from eclipse/jetty-10.0.x-WebSocketServlet
...
Issue #4722 - remove websocket-servlet
2020-05-07 22:45:04 +10:00
cf9df70935
Fixes #4808 - Review HttpClient Request header APIs.
...
Introduced:
* Request Request.headers(Consumer<HttpFields.Mutable>).
This allows applications to modify the headers, and chain calls.
It also delegates the precise semantic of put/add/remove/clear to HttpFields, so there is no API duplication.
* HttpRequest.header(HttpField) to efficiently add fields while normalizing the request (only used in implementation).
* HttpResponse.header(HttpField) to efficiently add fields while parsing the response (only used in implementation).
This pairs with HttpResponse.trailer(HttpField).
* HttpResponse.headers(Consumer<HttpFields.Mutable>) to modify the fields after they have been populated (only used in tests).
Removed:
* Request.[set,add,put,remove], replaced by headers(Consumer<HttpFields.Mutable>).
Deprecated:
* Request.header(String, String)
* Request.header(HttpHeader, String)
Both replaced by headers(Consumer<HttpFields.Mutable>) with clearer semantic for add/put/remove.
All the rest is code cleanup to remove the usage of the deprecated header() methods.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-05-04 23:16:59 +02:00
e5cca92199
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketServlet
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-01 15:46:03 +10:00
9bc9082ff3
Fix broken WebSocket UTF-8 continuation test
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-01 13:01:40 +10:00
3a3c5e5df3
Fix broken OSGI tests due to websocket-util-server
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-01 01:35:19 +10:00
71df3b57ee
Issue #4824 - add configuration on RemoteEndpoint for maxOutgoingFrames
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-30 09:39:58 +10:00
b0e57ffd6d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-LinkageErrorInvestigation
2020-04-29 22:52:33 +10:00
bf5d4ea554
Issue #4800 - Revert MethodHandle changes & update DistributionTests
...
- It seems it is correct to use the `MethodHandles.publicLookup().in()`
but this does not work if same webapp is deployed twice, so the
MethodHandle changes have been reverted and the test has been disabled
until a resolution to https://bugs.openjdk.java.net/browse/JDK-8244090 .
- The DistributionTest has been changed to properly reproduce the issue.
There must be a class in the signature of the websocket endpoint which
is available to both webapps and the client must send and receive an echo
message to ensure that the onOpen MethodHandle is actually invoked.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-29 22:52:26 +10:00
8c7e34f37d
Jetty 10.0.x immutable meta data ( #4777 )
...
Made HttpURI, HttpFields and MetaData immutable. The first two follow the same builder pattern and MetaData is constructor injection only.
* Immutable version of HttpFields
Preserve API and usage of HttpFields class while providing a read only interface and immutable implementation.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable version of HttpFields
Use an ArrayList in HttpFields. While slightly slower than the array, it will mostly be used as a builder pattern for an Immutable
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable version of HttpFields
Fixed exception type.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable version of HttpFields
asImmutable method
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData
Made HttpURIU immutable with a builder pattern.
MetaData immutable and working within http module.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData
Fixes from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData
Passing tests upto and including jetty-server
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData
Cleanup of HttpURI.Builder API as suggested in PR.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData
Added builder for MetaData.Request
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData
more api fixes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData
WIP making HttpFiels itself immutable. Currently working up to jetty-servlet.
Need to consider if content-length really is meta data and how much and when can we trust it.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData
WIP
Need to consider if content-length really is meta data and how much and when can we trust it. Also need to consider difference between h2 and h1 authority in metadata.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
jetty-client and jetty-servlet passing tests.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
Better align the style of immutability between `HttpFields` and `HttpURI`.
They both now have static build() and from() methods, plus Builder and Immutable implementations.
Potentially `Builder` could be renamed as `Mutable`
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
http2-server tests passed
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
http2-client tests passed
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
cleann build?
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
fix
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
more test fixes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
Cleanups, mostly using EMPTY when appropriate.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
Cleanups, use immutable
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
No trailers for connect
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
Fix CONNECT path handling
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
fixed rewrite query handling
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
rename Builders to Muttables
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
misc cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
Revert to using arrays due to garbage generated by streams and iterators (12% of a simple benchmark!).
Even if this garbage is an artifact of the JIT being disabled by observation, it can hide other allocations, so best to just use simple arrays!
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
More optimizations and better test coverage.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable Metadata
various cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
More optimizations
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
review changes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
changes after review:
+ less usage of Mutable
+ more usage of EMPTY
+ restored fragment handling
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
changes after review:
+ less usage of Mutable
+ less usage of asImmutable
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData WIP
changes after review:
+ less usage of Mutable
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData
changes after review:
+ better handling of URI in ContextHandler
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData
changes after review:
+ downcast in test to access mutable response headers.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Immutable MetaData
changes after review:
+ use put instead of add for one time headers
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* private
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-04-28 13:36:44 +02:00
64beae3382
Issue #4800 - test both cases individually
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-24 20:16:19 +10:00
fb85c71f8d
Issue #4800 - invalid PathParam types should be reported at Deployment
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-24 17:11:23 +10:00
870a765464
Issue #4800 - prevent LinkageErrors for WS lookup on JDK 14
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-24 13:31:29 +10:00
f5b0dc56d2
Issue #4800 - Reproduce LinkageError in WebSocket unit test
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-24 13:14:42 +10:00
7c2d804ce9
Change the WSServer to allow deployment of multiple webapps
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-24 10:18:24 +10:00
6ee0f2ebbc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketServlet
2020-04-23 13:53:10 +10:00
33a5db0618
Issue #4722 - fix typo for websocket-util-server jar
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-22 21:27:25 +10:00
c6e58e693b
Issue #4747 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-22 18:10:49 +10:00
b58697817f
Issue #4722 - create new module websocket-util-server
...
- This module contains the WebSocketUpgradeFilter.
- Also has an internal package with the components used
to implement websocket upgrades common to both the
jetty and javax websocket implementations.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-22 17:26:46 +10:00
d1163261a0
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4747-WebSocketTCK
2020-04-21 09:07:31 -05:00
e189691917
Issue #4722 - fix build, websocket util exporting jetty servlet with jpms
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-20 09:22:01 +10:00
f23236b09d
Merge pull request #4775 from eclipse/jetty-10.0.x-4771-WebSocketMessageHandlerTests
...
Issue #4771 - cleanup and add tests for the unused ws message handlers
2020-04-20 08:43:39 +10:00
213e157f42
Issue #4722 - changes from review
...
- Fix packages exposed in the websocket configuration
- Make servlet dependency for websocket-util optional
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-17 07:50:14 +10:00
2addb6a655
Jetty 10.0.x use HandlerList instead of HandlerCollection ( #4757 )
...
* Use HandlerList instead of HandlerCollection
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Use HandlerList instead of HandlerCollection
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-04-15 18:42:28 +02:00
4047e31ce7
Issue #4771 - cleanup and add tests for the different ws message handlers
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-15 10:50:27 +10:00
5699b9ff3d
Updating to version 9.4.29-SNAPSHOT
2020-04-08 13:15:04 -05:00
ab228fde9e
Updating to version 9.4.28.v20200408
2020-04-08 12:33:56 -05:00
45f822ed32
Issue #4747 - server is allowed to not select a websocket subprotocol
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-08 17:08:52 +10:00
4e69b48344
Issue #4747 - filter out synthetic annotated methods
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-08 15:31:42 +10:00
3d40e0e25d
Issue #4747 - correctly copy headers in websocket JsrUpgradeListener
...
Headers with the same name may not have been copied properly for
header values inspected and modified with a Configurator.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-07 15:06:25 +10:00
625dfd1a4d
Issue #4747 - Fix WS path params to work within a context path
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-07 12:18:29 +10:00
54ee3f3939
Issue #4747 - Throwing in onClose now calls onError
...
- This applies to the javax onClose method not the core onClosed method.
- Also fixes a bug where onClosed may never be called if onFrame throws.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-06 20:28:57 +10:00
2028b99e83
Issue #4747 - SessionID should return same String instance
...
Using the object hash code is not random enough to use as a unique ID.
Now using UUID.randomUUID() instead which sufficiently random.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-06 11:54:16 +10:00
664cb81e6d
Issue #4747 - Default close status code should be normal status
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-06 07:48:14 +10:00
51c42f2849
Improvements to the Jetty client documentation, protocols section.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-03 15:48:54 +02:00
9298883627
Issue #4722 - fix typo in JavaxWebSocketConfiguration
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-30 10:19:37 +11:00
89c4504d07
Issue #4722 - remove websocket-servlet
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-27 16:31:37 +11:00
d595c59622
Merge pull request #4702 from eclipse/jetty-10.0.x-4603-WS_HTTP2_NPE
...
Issue #4603 - avoid NPE during websocket HTTP/2 upgrade
2020-03-27 09:44:24 +11:00
85ea14e33d
Issue #4603 - clarifications in comments and improve test
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-25 22:43:43 +11:00
ea80253cca
Merge pull request #4694 from eclipse/jetty-10.0.x-4691-consistent_methodhandles_lookup
...
Issue #4691 - use static methods with javadoc to get MethodHandle lookups
2020-03-25 10:31:37 +11:00
af899b0e68
Merge pull request #4602 from eclipse/jetty-10.0.x-4340-ServiceLoader
...
Issue #4340 - Continue after ServiceLoader ServiceConfigurationError
2020-03-25 10:30:38 +11:00
c0b6d9f677
Issue #4691 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-24 14:30:02 +11:00
04cc21fe40
Issue #4691 - use static methods with javadoc to get MethodHandle lookup
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-23 16:43:09 +11:00
d4c2893843
Issue #4691 - Remove unnecessary throws from getMethodHandleLookup.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-23 11:44:06 +11:00
10f4fda0de
Issue #4691 - Use MethodHandles.lookup() consistently in WebSocket code.
...
* Using MethodHandles.publicLookup().in(...) instead of privateLookupIn(...).
* Moved test WebSocket EndPoint classes into the proper package, otherwise
they would not be accessible because the test package is not exported.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-22 16:42:13 +01:00
e385dea838
Do not deploy websocket test projects
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 14:04:04 -05:00
7e0fff9a89
Merge pull request #4686 from eclipse/jetty-10.0.x-4685-slf4j-impl-not-included
...
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
2020-03-20 12:04:32 -05:00
43419802b7
Issue #4685 - Declare <scope> for jetty-slf4j-impl everywhere
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:12:08 -05:00
99f1f8b897
Issue #4685 - Cleanup from review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:07:25 -05:00
9492a5379c
Issue #4685 - eliminate <version> in jetty-slf4j-impl
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 10:42:36 -05:00
2c600f2b68
Issue #4685 - Mark jetty-slf4j-impl as test scope by default
...
+ Update logging in test-hazelcast-sessions
+ Update logging in test-infinispan-sessions
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 09:55:15 -05:00
04cecaaaef
Issue #4340 - Change usages to more closely follow previous behaviours
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-20 17:02:49 +11:00
a16abe1693
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
...
+ Mark as a test dependency
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-19 17:46:41 -05:00
9cbd9ab44e
Merged 'jetty-10.0.x' into 'jetty-10.0.x-4382-h1_to_h2_upgrade'.
2020-03-19 18:17:57 +01:00
0541c5efb4
fix javadoc aggregate generation by using last maven javadoc plugin 3.2.0 ( #4675 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-19 07:06:13 +10:00
2940eb8ab5
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4382-h1_to_h2_upgrade'.
2020-03-18 11:44:06 +01:00
e35b3b29d6
Issue #4656 generalise XmlConfiguration elements ( #4661 )
...
* Issue #4656 generalise XmlConfiguration elements
Extended the use of Id, Class elements
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4657 Validation in XmlConfiguration
Default to validate if xerces is in the name
Fixed test harness to prepend DTD.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4657 Validation in XmlConfiguration
WIP on adding validation to XMLs
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4656 - Fix bad xml id attribute usage in jetty-maven-plugin
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-17 09:38:21 +01:00
30d36ed68c
Merge branch jetty-10.0.x into jetty-10.0.x-4340-ServiceLoader
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-17 15:00:30 +11:00
e050160101
Merge branch jetty-10.0.x into jetty-10.0.x-WebSocket-JPMS
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-17 11:07:29 +11:00
57604d0955
Issue #4572 - Mechanical Change to use org.slf4j
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 15:48:25 -05:00
8b7e64915f
Issue #4572 - Replace Jetty Logging with SLF4J
...
* Introducing jetty-slf4j-impl
* Make Jetty use org.slf4j
* Removed most of org.eclipse.jetty.util.log classes
* Left org.eclipse.jetty.util.log.Log and
org.eclipse.jetty.util.log.Logger but as
simple bridge classes that are deprecated
* Migrated code using org.eclipse.jetty.util.log.StacklessLogging
to org.eclipse.jetty.logging.StacklessLogging found in
the jetty-slf4j-impl
* Moved logging start modules from jetty-util to jetty-home
* Simplified logging start modules
* Updated code that was using StdErrLog directly
* Updating module-info.java for org.slf4j
* removing org.eclipse.jetty.util.log.class references
* jetty-start supports manually declared default provider
+ and we use it to default "logging" to the "logging-jetty" provider
* Cleaning up jetty-maven-plugin and IT testing for Logging
* Using old slf4j for it testing
* Updating compiler config to show Xlint:exports warnings
* Updating console-capture and logging-noop
* Adding slf4j bridge (capture) jetty modules
* Updates to jetty logging module locations
* Changing reference to slf4j dependent mod
* Process requested enabled modules in topological order
* Limiting inclusions in shaded jetty-start
+ Also adding note to jetty-util classes that are used by
jetty-start
* Default logging level on baseline logging config is INFO (not DEBUG)
* Changing from system to server classes in logging
* Updating other modules to use new logging names
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 11:21:54 -05:00
466517a0e8
Issue #4382 - Support HTTP/1 upgrade to HTTP/2 in HttpClient.
...
* Moved implementation of UpgradeTo from HTTP2ServerConnection
to HTTP2Connection, since now also the client connection
can be upgraded to.
* Split HTTP2Session.newStream(), since now the client must
be able to create the implicit stream 1 corresponding to
the HTTP/1.1 upgrade request, so that the HTTP/2 response
after the upgrade finds the stream.
* The HTTP/1.1 upgrade mechanism has been generalized.
Before it was based on HttpConnectionUpgrader and a hook
in HttpChannelOverHTTP.exchangeTerminating().
Now it is based on UpgradeProtocolHandler that when sees
a 101 response it will trigger the upgrade mechanism.
* Introduced ConnectionPool.accept(Connection) to transfer
a connection from the HTTP/1.1 connection pool to the
HTTP/2 connection pool after the upgrade.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-13 15:59:13 +01:00
a6b2b3ff98
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4340-ServiceLoader
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-13 17:02:26 +11:00
ac69c53077
jetty websocket modules should not transitively export websocket-core
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-13 12:07:36 +11:00
a0626adad5
javax websocket modules should not transitively export websocket-core
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-12 16:21:07 +11:00
3d74148652
Issue #4650 - do not use ServiceLoader every time a WSSession is started
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-12 12:34:03 +11:00
fef25e7825
Merge branch jetty-10.0.x into jetty-10.0.x-4538-MessageReaderWriter
2020-03-11 14:23:47 +11:00
3a77542303
upgrade shade plugin and align version ( #4639 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-05 09:10:12 +10:00
b014e2faca
Merge pull request #4597 from eclipse/jetty-9.4.x-847-WSasyncWriteTimeout
...
Issue #847 - deprecate asyncWriteTimeout in the jetty websocket API
2020-03-02 10:19:01 +11:00
8aabb52557
Updating to version 9.4.28-SNAPSHOT
2020-02-27 13:03:44 -06:00
a304fd9f35
Updating to version 9.4.27.v20200227
2020-02-27 12:21:57 -06:00
81424f1f44
Issue #4340 - Continuing after ServiceLoader ServiceConfigurationError
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-25 19:49:22 +11:00
b138ce55bb
Issue #847 - deprecate asyncWriteTimeout in the jetty websocket api
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-21 14:58:19 +11:00
adbb3f165e
Issue #4571 - review UTF-8 validation in MessageSinks
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-20 19:00:53 +11:00
34fd1481b8
Issue #4571 - always close MessageSink before completing the Future
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-20 18:47:04 +11:00
b2eddff228
Issue #4571 - fix broken tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-19 19:38:26 +11:00
bc6c950304
add missing licence header
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-19 19:33:11 +11:00
5c839d791d
Issue #4538 - allow MessageInputStream not to read to EOF
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-19 19:31:26 +11:00
97abed549b
Issue #4538 - Combine MessageWriterTests, add test for UTF-8 validation
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-19 16:13:22 +11:00
1b123b87a9
Issue #4538 - add invalid utf8 validation tests for MessageReader
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-19 11:32:37 +11:00
2467d5a8c5
Issue #4538 - Rework MessageInputStream and MessageReader
...
Message reader now validates UTF8
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-19 11:32:26 +11:00
6eccc7ebce
Issue #4538 - MessageWriter delegates to MessageOutputStream
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-19 11:32:15 +11:00
e2f86f9a19
Issue #4538 - simplify MessageInputStream and DispatchedMessageSink
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-19 11:32:03 +11:00
71b11f0887
Issue #4571 - simplify partial MessageSinks reduce copying
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-19 11:26:56 +11:00
36cccd2c88
Issue #4571 - optimise aggregating text and binary MessageSinks
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-19 11:25:05 +11:00
5fe202f29f
Issue #4548 - clean up websocket removing duplicated and unused classes ( #4549 )
...
Create new module websocket-util which contains implementation classes shared by websocket-jetty and websocket-javax. Many of these classes had to be changed as the javax and jetty versions of them differed slightly.
Also includes general cleanups, removed unused interfaces and classes, etc..
2020-02-18 21:43:54 +11:00
aaf6f17766
Merge pull request #4555 from eclipse/jetty-9.4.x-4537-WebSocketSpin
...
Issue #4537 - fix potential spin when discarding in WebSocketConnection
2020-02-13 09:14:06 +11:00
66f4bda2ea
comments
...
Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
2020-02-10 21:02:36 +11:00
d371c1498c
Improve performance of small websocket messages
...
Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
2020-02-10 20:07:33 +11:00
20621b76fb
Issue #4537 - fix potential spin when discarding in WebSocketConnection
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-10 18:29:55 +11:00
abdb9f2ff6
Jetty 10.0.x methodhandles lookup linkage ( #4552 )
...
* use a lookup dedicated to the target class (webapp classloader) to avoid collision with server classloader
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* cleanup war test dependencies
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* remove empty lines
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* make it clear it is a bad websocket webapp only for testing purpose and add a good websocket webapp
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* no need anymore of this dependency
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-02-09 11:59:57 +10:00
e4c1984fd0
Merge pull request #4536 from eclipse/jetty-10.0.x-4447-websocketModules
...
Issue #4447 - separate modules for jetty and javax websockets
2020-02-07 16:15:27 +11:00
b3144dd401
Issue #4447 - update websocket-jetty module description
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-07 16:14:32 +11:00
41a7b8d4e3
Merge pull request #4539 from eclipse/jetty-10.0.x-4501-SharedBlockingCallback
...
Issue #4501 - remove all SharedBlockingCallback usage from websocket
2020-02-05 10:07:12 +11:00
cbb09413fd
Issue #4501 - fix test expectations to throw CloseChannelException
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-03 18:34:19 +11:00
3344772e2f
Issue #4447 - hard code in version for javax-websocket-api 1.1.2
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-03 18:29:46 +11:00
182daf8504
Issue #4501 - remove all SharedBlockingCallback usage from websocket
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-03 17:20:45 +11:00
f8219a56cc
Merge pull request #4535 from eclipse/jetty-10.0.x-4462-javaxWSClose
...
Issue #4462 - do not throw IOException on Javax websocket close
2020-02-03 10:22:23 +11:00
fde1ab3e5b
Issue #4462 - fix incorrect test expectations
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-31 16:31:35 +11:00
a7c0c57496
Issue #4447 - separate modules for jetty and javax websockets
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-31 15:58:20 +11:00
bdaa06e8dd
Issue #4462 - do not throw IOException on Javax websocket close
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-31 11:09:30 +11:00
ce6e146ac1
Merge pull request #4489 from eclipse/jetty-10.0.x-2643-pkcs12_keystores
...
Fixes #2643 - Switch SslContextFactory.keystoreType from JKS to PKCS12.
2020-01-30 19:28:49 +01:00
b4d2ccc6b8
Make the WebSocketServerContainer initialize methods private
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-30 15:01:15 +11:00
006fd3f913
Issue #4226 - fix test failures
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-30 11:26:51 +11:00
82c61c48eb
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4226-JavaxWebSocketJPMS
2020-01-30 10:37:34 +11:00
19354d0c24
Merge pull request #4523 from eclipse/jetty-10.0.x-4502-wsOnClose
...
Issue #4502 - allow changing of close response from jetty and javax websocket onClose events
2020-01-30 09:10:48 +11:00
96741ebb28
Fixed compilation issues after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-29 10:11:21 +01:00
1afb7fd1f2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4450-WebSocketCoreJPMS
2020-01-29 19:21:39 +11:00
8638fb2cc3
Fix broken test cases
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-29 19:13:03 +11:00
fdd27a9f28
Issue #4502 - add onClose tests for Jetty and Javax WS APIs
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-29 15:20:36 +11:00
4ef208e9f6
Issue #4502 - onClose can now be triggered on receiving a close frame
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-29 15:19:48 +11:00
f6fd3c41a5
Issue #4462 - Prevent jetty 10 WebSocket close deadlocks ( #4472 )
...
- Replicate problems from WS close deadlock with test cases
- use FutureCallback instead of SharedBlockingCallback for WS blocking methods
- add timeout to the blocking callbacks for WS for (idleTimeout + 1000ms)
- Core throws ClosedChannelException instead of ISE if send after closed
2020-01-29 09:15:40 +11:00
a4b85d1df2
Issue #4226 JavaxWebSocketServerContainer leaking into public signature
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-28 18:16:22 +11:00
6698592139
Add tests for Javax ServerContainer default configuration.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-28 18:15:27 +11:00
6c2c4d8ad7
Issue 4450 - remove ConfigurationCustomizer static method
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-24 11:05:14 +11:00
b64964113c
Merge pull request #4486 from eclipse/jetty-9.4.x-4475-WebSocketStreamMessageOrder
...
Issue #4475 - fix WebSocket streaming message ordering
2020-01-24 10:01:22 +11:00
64d72abde6
Extension interface now uses CoreSession and not Configuration
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-23 10:20:40 +11:00
bc88224f19
combine ConfigurationHolder and ConfigurationCustomizer
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-22 18:15:59 +11:00
f35a01c73c
further checkstyle fixes
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-22 17:26:07 +11:00
acabec2e91
fix licence headers and checkstyle
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-22 16:08:08 +11:00
86037367bc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4450-WebSocketCoreJPMS
2020-01-22 14:51:51 +11:00
56fc476d55
Updating to version 9.4.27-SNAPSHOT
2020-01-17 07:00:10 -06:00
7b38981d25
Updating to version 9.4.26.v20200117
2020-01-17 06:21:47 -06:00
d60b4459bf
Fixes #2643 - Switch SslContextFactory.keystoreType from JKS to PKCS12.
...
Updated old keystores to new PKCS12 keystores.
Removed unused keystores and truststores.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-17 09:48:51 +01:00
08b1be6ea8
Issue #4475 - improve testing for MessageInputStream
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 18:37:47 +11:00
3d309a5797
Issue #4475 - use state machine for MessageInputStream
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 18:37:20 +11:00
3fd7094c01
Issue #4475 - suspend/resume to control reading frames while streaming
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 13:11:48 +11:00
01a5974f4b
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpTester.java
# jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParserTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/matchers/HttpFieldsMatchersTest.java
# jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java
# jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterLenientTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletLifeCycleTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultNoRecompressTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
# jetty-unixsocket/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketClient.java
# jetty-util/src/test/java/org/eclipse/jetty/util/B64CodeTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java
# jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/LargeMessageTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerGoodSignaturesTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerInvalidSignaturesTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSetTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/utils/ReflectUtilsTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/RestartContextTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerGoodSignaturesTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerInvalidSignaturesTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfigTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilQuoteTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ConnectionManagerTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/GeneratorTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TextPayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase11.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase12.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase2.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase4.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase73.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventDriverTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedScannerTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ConnectionStateTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/http/HttpResponseHeaderParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageDebug.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/Utf8CharBufferTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/UnitGenerator.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8PartialBuilderTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RedirectWebSocketClientTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/SimpleServletServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6BadUTF.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6GoodUTF.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7BadStatusCodes.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7GoodStatusCodes.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java
# pom.xml
# tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationsTest.java
# tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java
# tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
# tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java
2020-01-15 12:20:20 -06:00
81d32f64f0
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketUpgradeRequest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
2020-01-15 11:44:43 -06:00
8c65309963
Addressing Checkstyle violations in src/test/java
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 12:33:34 -06:00
c7b6ccca98
Issue #4475 - add tests not reading until EOF
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 19:14:48 +11:00
16c406b55c
Issue #4475 - add test for fragmented frames
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 15:15:56 +11:00
26d12b9c2d
Issue #4475 - proof of concept
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 14:52:50 +11:00
a7b9df96fd
cleanup WebSocket logging in EventSocket
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 10:33:19 +11:00
e1f19be353
Closes #2620 - guard against exceptions for WebSocket onClose and onError ( #4346 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 09:22:56 +11:00
5bd4cee7c8
Fixes #4408 - fix issues with javax metadata and decoders ( #4452 )
...
Remove the metadata cache per endpoint class, to allow deployment of the same class with different EndpointConfig settings.
JavaxServerFrameHandlerFactory now matches for decoders before matching for basic onMessage signatures.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-13 13:49:10 +11:00
1f8ad08281
Fixing Checkstyle violations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-09 15:56:06 -06:00
5f82e17d2f
Issue #3578 - Adopt EPL-2.0 for Jetty-10.
...
WIP: updated copyright headers for Java files.
TODO: doc files and META-INF files inside jars.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-09 20:10:19 +01:00
b14c9b6fae
Updated copyright in new classes.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 17:40:11 +01:00
17ec83f5cf
Merged 'jetty-10.0.x' into 'jetty-10.0.x-4450-WebSocketCoreJPMS'.
2020-01-07 17:26:31 +01:00
a5c99207fc
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-01-07 17:02:40 +01:00
923ec38adf
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2020-01-07 16:51:25 +01:00
e3c8546667
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2020-01-07 16:35:05 +01:00
de890bb1b7
Happy New Year 2020.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
f4e7e4c3db
Merge branch 'release-9.4.25' into jetty-9.4.x
2020-01-03 12:49:27 -06:00
ff48fba585
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:59:21 +01:00
e1371a1c13
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
eef87a3fe1
fix broken test
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-31 12:53:05 +11:00
356e98f737
Clean up websocket-core package structure
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-31 09:33:58 +11:00
f1838c5f88
Issue #4450 - remove methods to create WS CoreSession and Connection
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-30 13:50:00 +11:00
cf31ab2b9a
Issue #4450 - don't expose ExtensionStack through getter on Negotation
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-30 13:38:05 +11:00
0d571ef2c2
Issue #4450 - websocket Extensions no longer rely upon WSCoreSession
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-30 13:25:30 +11:00
c98897315c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4225-jpms_transitivity
2019-12-27 19:27:59 +11:00
db0edf23de
Update websocket artifact IDs
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-23 13:32:21 +11:00
db45b0b906
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3678-WebSocketRename
2019-12-23 11:03:40 +11:00
0d433f50f6
Issue #4401 - Fix WebSocket ClassLoader issues. ( #4435 )
...
- WebSocketCoreSession now updates the context classloader before invoking application code.
- JavaxWebSocketConfiguration now protectAndExposes JavaxWebSocketClientContainerProvider
so it can be discovered by the ServiceLoader in a webapp.
2019-12-23 09:54:08 +11:00
8974176c4b
Updating to version 9.4.26-SNAPSHOT
2019-12-20 11:30:41 -06:00
a9729c7e7f
Updating to version 9.4.25.v20191220
2019-12-20 10:46:56 -06:00
78c57131ae
update values for bundle-symbolic-name
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-20 16:21:34 +11:00
bc21b354c7
Rename websocket modules and directories with new naming convention.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-20 15:41:55 +11:00
0982af15f9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
2019-12-19 16:11:16 -06:00
Lachlan Roberts
Simone Bordet
Joakim Erdfelt
Chris Walker
Jan Bartel
olivier lamy
gregw
Ludovic Orban
Sergey Tselovalnikov