Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,242 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

3491 Commits

Author SHA1 Message Date
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Lachlan 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
Lachlan Roberts fd5c07eceb removed dangling javadoc comment 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-08-06 08:25:40 +10:00
Lachlan 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
Simone Bordet c49035570e Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-convert_synchronized_to_autolock'. 2020-08-04 16:32:55 +02:00
Lachlan Roberts 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
Lachlan Roberts 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
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
Lachlan Roberts 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
Lachlan Roberts 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
Lachlan Roberts 9027e17095 Issue #5044 - rename the ClientUpgradeRequest to CoreClientUpgradeRequest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-30 12:51:42 +10:00
Simone Bordet 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
Lachlan Roberts 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
Lachlan Roberts 5ff0ce4142 Issue #5044 - implement is secure on DelegatedJettyClientUpgradeRequest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-29 22:22:14 +10:00
Lachlan Roberts 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
Lachlan Roberts 9e383f0891 Issue #4919 - changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-28 16:48:49 +10:00
Simone Bordet 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
Lachlan Roberts 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
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 Roberts d5cf429537 fix websocket tests from merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-23 12:17:20 +10:00
Lachlan Roberts 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
Lachlan Roberts 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
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
Joakim Erdfelt 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
Lachlan Roberts 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
gregw 965e73e9e9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-20 12:01:53 +02:00
Lachlan Roberts 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
Lachlan Roberts 0818f54be8 cleanup the ws javax EchoSocket test class 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-20 15:32:46 +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
Lachlan Roberts 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
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 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
Lachlan Roberts 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
Lachlan 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
Lachlan Roberts 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
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 145dcf502c cleanups after merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 16:52:50 +10:00
Lachlan Roberts 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
Simone Bordet 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
Lachlan Roberts 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
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