Commit Graph

23009 Commits

Author SHA1 Message Date
Lachlan 054069fa59
Merge pull request #6171 from eclipse/jetty-10.0.x-WebSocket-DisabledSessionTest
Re-enable disabled tests for the WebSocket SessionTest
2021-04-15 20:13:33 +10:00
Lachlan Roberts 61ead137b2 Fix intellij warnings in CustomRequestLogTest.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-15 19:04:30 +10:00
Lachlan Roberts 382aed8374 Issue #5817 - allow CustomRequestLog to be filtered with BiPredicate
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-15 19:03:50 +10:00
Jan Bartel 6a074bc2cf
Issue #5684 Reduce intensity and rename SameNodeLoadTest (#6143) (#6162)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-04-15 11:12:27 +10:00
Lachlan Roberts 045bc72c92 Disable test for WebSocket CDI HttpSession injection and link to issue.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-15 09:40:11 +10:00
Simone Bordet f4f5c5f292 Re-enabled SmallThreadPoolLoadTest.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-14 09:26:48 +02:00
Lachlan Roberts afa2b71f4f Re-enable disabled tests for the WebSocket SessionTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-14 15:22:56 +10:00
Lachlan Roberts bd79187194 Issue #6166 - fix bug in the MessageInputStream byte array read
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-14 10:41:35 +10:00
Lachlan 8366dcf03e
Fix WebSocket operations guide for Jetty 10 documentation. (#6161)
* Include protocols-websocket.adoc in the Operations Guide documentation.
* Fix websocket header hierarchy in documentation.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-13 17:24:44 +02:00
Simone Bordet 1e3f3a3cbb
Fixes #6049 - Default provider [files] section always executed (#6051)
* Fixes #6049 - Default provider [files] section always executed

Keeping only enabled modules when processing the modules,
so that default provider modules don't get processed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-12 10:41:51 +02:00
Lachlan 353b3db7b1
Merge pull request #6144 from eclipse/jetty-10.0.x-DisabledTests-TextStreamTest
Fix two disabled tests in TextStreamTest.
2021-04-12 14:55:03 +10:00
Olivier Lamy 3c9de65b96
Issue #6098 jetty-cdi in jetty-bom (#6154)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-04-12 13:20:47 +10:00
Simone Bordet e163b001c3 Fixes #6105 - HttpConnection.getBytesIn() incorrect for requests with chunked content
Moved recording of bytes to fillRequestBuffer(),
so they are accounted also for async reads.
Added test case.
Fixed test that was too strictly comparing HttpConnection.bytesIn,
that now report a correct, but larger value.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit aed20abcbe)
2021-04-10 18:51:54 +02:00
Greg Wilkins b56edf511a
UriCompliance mode improvements #6132 (#6137)
Resolve #6132

Improve configuration of ambiguous URI handling.
Added NON_CANONICAL_AMBIGUOUS_PATHS
2021-04-08 12:03:30 +10:00
Lachlan Roberts 1cb10b8548 Remove unnecessary comment.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-08 09:28:28 +10:00
Lachlan Roberts f91334e6d7 Fix two disabled tests in TextStreamTest.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-07 20:54:43 +10:00
Lachlan Roberts 0d84f35b0d Issue #6106 - Decorate javax.websocket components during the websocket upgrade.
Decoration should not be delayed until onOpen it should be during the call to
the WebSocketUpgradeFilter or WebSocketServlet.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-07 16:43:10 +10:00
Lachlan Roberts 02ef27246c Fix broken websocket tests.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-06 23:18:41 +10:00
Lachlan Roberts bda4c21bcb Issue #6106 - add testing for CDI with javax.websocket Encoder & Decoder
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-06 22:58:23 +10:00
Lachlan Roberts f858aa653c Issue #6106 - always decorate javax.websocket Configurators
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-06 22:39:15 +10:00
Lachlan Roberts a1e522755b Issue #6106 - Decorate javax.websocket Encoder & Decoders.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-06 16:09:15 +10:00
Guilherme Amaral e3c87fc2af
Changed exception check by JUnit API usage (#6133) 2021-04-06 08:51:50 +10:00
Joakim Erdfelt 25b96faa86
Merge pull request #6136 from eclipse/jetty-10.0.x-update-versiontxt-cves
Update VERSION.txt
2021-04-05 15:18:46 -05:00
Joakim Erdfelt 56f86d39f9
Update VERSION.txt
+ Merge from jetty-9.4.x
+ Add CVE references
+ Remove testcase references

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-04-05 13:36:23 -05:00
Tony Thompson 46a76d955b
Exposed the configuration option to scan manifests on the JAR scanner. (#6097)
* Exposed the configuration option to scan manifests on the JAR scanner.

Signed-off-by: Tony Thompson <tthompson1@lenovo.com>
2021-04-02 17:50:12 +11:00
Lachlan Roberts ac5eb54e1e Issue #6106 - fix WebSocket/CDI integration
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-31 18:49:31 +11:00
Lachlan Roberts c29bad2301 Issue #6106 - add tests for WebSocket/CDI integration.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-31 18:36:15 +11:00
Lachlan d7de3ea660
Merge pull request #6092 from eclipse/jetty-10.0.x-6084-GzipHandlerCompressionPool
Issue #6084 - CompressionPools should not be configured through the GzipHandler
2021-03-31 11:08:52 +11:00
Lachlan 8a10cd1615
Merge pull request #6094 from eclipse/jetty-10.0.x-WebSocketServerComponents
Do not store WebSocketComponents in Server scope.
2021-03-31 10:55:36 +11:00
Greg Wilkins 20fae6485c
Jetty 10.0.x #5684 disabled tests (#6081)
* Fixes for #5684
Simplified CyclicTimeoutTest#testBusy
InclusiveByteRange clears range list on errors
InclusiveByteRange is forgiving of tab separators and leading 0s

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-30 22:24:56 +02:00
Lachlan Roberts 16b014c2fb Unmanage beans on WSSComponents if they are also beans on server.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-30 17:50:55 +11:00
Chris Walker 722f4ec2e3
Fix JDURL. Resolves #6110 2021-03-29 09:52:58 -05:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-26 06:10:47 +00:00
Olivier Lamy 2d360b1c2c Reverted VERSION.txt changes for dropped release.
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-26 06:05:22 +00:00
Lachlan b68a5fec2f
Merge pull request #6107 from eclipse/jetty-10.0.x-JavaxWebSocketContainerProvider
Make the JavaxWebSocketClientContainer.getContainer(HttpClient) method static.
2021-03-26 16:18:34 +11:00
Lachlan Roberts 47ec9b1a7e Modify SecureClientContainerExample to use the new getContainer(HttpClient) method.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-26 14:55:32 +11:00
Lachlan Roberts a86a0c2662 Add static utility methods on container to add and remove beans.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-26 11:11:45 +11:00
Lachlan Roberts 57779c6026 Make the HttpClient getContainer method static on JavaxWebSocketClientContainerProvider.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-26 11:11:18 +11:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet bd030c7d13 Reverted VERSION.txt changes for dropped release.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:09:53 +01:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:02:45 +01:00
Simone Bordet e068119bc3 Issue #6085 Fix duplicate valid session cookies to pick first valid.
Cosmetic changes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 15:53:03 +01:00
Simone Bordet 43562774a8 Issue #6085 Fix duplicate valid session cookies to pick first valid.
Signed-off-by: Jan Bartel <janb@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 15:53:03 +01:00
Lachlan Roberts b51e40892d Fix lifecycle issues with WebSocketComponents and improve testing.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-26 00:07:57 +11:00
Lachlan Roberts 3ad772e5e7 Issue #6084 - Add setters for the Deflater/Inflater pool used by GzipHandler.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-25 20:24:24 +11:00
Olivier Lamy 30633a4389 releasing 10 need dot now
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-25 06:22:04 +00:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00