Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,676 Commits 78 Branches 465 Tags 373 MiB
Commit Graph

2618 Commits

Author SHA1 Message Date
Lachlan Roberts 7df0dfa7c2 warn if did not read until EOF once per MessageInputStream 2020-10-07 15:41:51 +11:00
Lachlan Roberts 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
Lachlan Roberts a91a7630e0 fix NPE from contextClassLoader in XmlBasedHttpClientProvider 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-01 17:40:37 +10:00
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 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
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Lachlan Roberts 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
Joakim Erdfelt 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
Lachlan Roberts 5d951e840e fix licence header and checkstyle 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-23 10:34:50 +10:00
Lachlan Roberts 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
Lachlan Roberts b44b62038c reorder methods for maxOutgoingFrames, fix javadoc 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-10 09:50:52 +10:00
Lachlan Roberts 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
Lachlan Roberts b5810b930d Issue #5824 - improve javadocs for RemoteEndpoint maxOutgoingFrames 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-04 17:43:36 +10:00
Lachlan Roberts 52c9f8730b Issue #4824 - create test for WebSocket maxOutgoingFrames 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-04 10:45:47 +10:00
Lachlan Roberts f788260abd Issue #4824 - use WritePendingException instead of IOException 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-03 14:58:09 +10:00
Lachlan Roberts 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
Lachlan Roberts 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
Joakim Erdfelt 46402bc382
Issue #5193 - Updating logging per review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-28 05:46:07 -05:00
Lachlan Roberts 92e5abb1bd add missing licence header in SingleOnMessageTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-08-27 18:05:56 +10:00
Lachlan Roberts 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
Lachlan Roberts eebb47cbc5 add test to reproduce issue #5193 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-08-27 17:14:01 +10:00
Joakim Erdfelt 1690e9d30d
Issue #5193 - Adding more EventDriver logging 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-26 06:56:17 -05:00
Lachlan Roberts 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
Lachlan 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
Lachlan Roberts 1663a6d7af Issue #5125 - Generalise WebSocketConnectionStatistics into IncludeExcludeConnectionStatistics 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-08-14 15:19:06 +10:00
Lachlan 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
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 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
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
Lachlan 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
gregw 6125a07a63 Issue #5053 
removed weak random from Masker.
 2020-07-17 17:59:57 +02:00
gregw 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
Greg Wilkins 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
Lachlan Roberts 860cba7877 Use Consumer<NativeWebSocketConfiguration> in ConnectFutureTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 07:45:16 +10:00
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 25a7da2635 add test for abort with CompletableFuture.completeExceptionally() 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 21:47:31 +10:00
Lachlan Roberts 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
Lachlan Roberts 9c910e9413 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 18:09:40 +10:00
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan 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
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 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
Simone Bordet 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
Lachlan Roberts fbe3803cd1 fix checkstyle issue 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-06 12:19:38 +10:00
Lachlan Roberts 6a8a6efd1c Issue #5018 - add request timeout onto ClientUpgradeRequest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-04 11:37:45 +10:00
Lachlan Roberts 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
Lachlan Roberts 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
Joakim Erdfelt 6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00
Joakim Erdfelt 271836e4c1 Updating to version 9.4.30.v20200611 2020-06-11 07:21:18 -05:00
Lachlan Roberts 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
Lachlan Roberts 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
Joakim Erdfelt 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
Joakim Erdfelt 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
Lachlan 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
Lachlan Roberts a11c7f554c Issue #4903 - cleanup catch statement from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-05-27 09:42:44 +10:00
Lachlan Roberts 5c63b0ef78 Issue #4903 - catch Throwable instead of RuntimeException 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-05-26 17:37:04 +10:00
Lachlan Roberts 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
Lachlan Roberts 470d948504 Issue #4903 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-05-26 09:35:17 +10:00
Lachlan Roberts 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
Lachlan Roberts 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
Joakim Erdfelt 5d6f3e2ddc Updating to version 9.4.30-SNAPSHOT 2020-05-21 13:42:25 -05:00
Joakim Erdfelt 77c232aed8 Updating to version 9.4.29.v20200521 2020-05-21 12:04:14 -05:00
Ludovic Orban 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
Lachlan Roberts 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
Joakim Erdfelt 5699b9ff3d Updating to version 9.4.29-SNAPSHOT 2020-04-08 13:15:04 -05:00
Joakim Erdfelt ab228fde9e Updating to version 9.4.28.v20200408 2020-04-08 12:33:56 -05:00
Lachlan Roberts 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
Olivier Lamy 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
Lachlan 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
Joakim Erdfelt 8aabb52557 Updating to version 9.4.28-SNAPSHOT 2020-02-27 13:03:44 -06:00
Joakim Erdfelt a304fd9f35 Updating to version 9.4.27.v20200227 2020-02-27 12:21:57 -06:00
Lachlan Roberts 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
Lachlan 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
Sergey Tselovalnikov 66f4bda2ea comments 
Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
 2020-02-10 21:02:36 +11:00
Sergey Tselovalnikov d371c1498c Improve performance of small websocket messages 
Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
 2020-02-10 20:07:33 +11:00
Lachlan Roberts 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
Lachlan 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
Joakim Erdfelt 56fc476d55 Updating to version 9.4.27-SNAPSHOT 2020-01-17 07:00:10 -06:00
Joakim Erdfelt 7b38981d25 Updating to version 9.4.26.v20200117 2020-01-17 06:21:47 -06:00
Lachlan Roberts 08b1be6ea8 Issue #4475 - improve testing for MessageInputStream 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-17 18:37:47 +11:00
Lachlan Roberts 3d309a5797 Issue #4475 - use state machine for MessageInputStream 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-17 18:37:20 +11:00
Lachlan Roberts 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
Joakim Erdfelt 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
Lachlan Roberts 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
Lachlan Roberts 16c406b55c Issue #4475 - add test for fragmented frames 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-14 15:15:56 +11:00
Lachlan Roberts 26d12b9c2d Issue #4475 - proof of concept 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-14 14:52:50 +11:00
Lachlan Roberts a7b9df96fd cleanup WebSocket logging in EventSocket 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-14 10:33:19 +11:00
Lachlan 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
Simone Bordet 923ec38adf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-07 16:51:25 +01:00
Simone Bordet e3c8546667 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-07 16:35:05 +01:00
Simone Bordet de890bb1b7 Happy New Year 2020. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-07 16:25:32 +01:00
Joakim Erdfelt f4e7e4c3db Merge branch 'release-9.4.25' into jetty-9.4.x 2020-01-03 12:49:27 -06:00