Commit Graph

22881 Commits

Author SHA1 Message Date
Lachlan Roberts a0cca858a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-6106-WebSocketCDI 2021-04-27 16:15:52 +10:00
Lachlan 3b88b4713c
Merge pull request #6176 from eclipse/jetty-10.0.x-5817-CustomRequestLogFiltering
Issue #5817 - allow CustomRequestLog to be filtered with BiPredicate
2021-04-27 16:04:54 +10:00
Olivier Lamy 1294222797
Upgrade commons-io 2.7 (copy of https://github.com/eclipse/jetty.project/pull/6213) (#6216)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-04-27 15:59:18 +10:00
Lachlan 24653e1aa0
Merge pull request #6215 from eclipse/jetty-10.0.x-FixTypo
Use correct logger in AvailableEncoders.
2021-04-27 15:56:04 +10:00
Lachlan Roberts ce8ede5c71 Use correct logger in AvailableEncoders.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-27 10:38:42 +10:00
Lachlan 3e366e6c0b
Merge pull request #6198 from eclipse/jetty-10.0.x-WebSocketEncoderDecoderLifeCycle
Ensure that javax.websocket Encoder/Decoder destroy method is called.
2021-04-27 10:32:28 +10:00
Olivier Lamy cda38abbad
Issue #5798 fix jetty runner startup error and add jsp support as well (#6115)
* Issue #5798 fix jetty runner startup error and add jsp support as well

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* Add test to ensure jetty runner starts correctly

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* remove unused imports

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix help description

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* improvement based on Joakim comment, add it test with the path

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-04-27 10:26:33 +10:00
Lachlan 894e4f400b
Merge pull request #6195 from eclipse/jetty-10.0.x-MigrationGuide
Add migration guide for WebSocket changes between 9.4 and 10.
2021-04-27 09:59:55 +10:00
Lachlan Roberts 988e158db3 Improve javadoc for CustomRequestLog.setFilter
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-26 16:46:53 +10:00
Simone Bordet 1b6fb39867 Re-enabled ConnectionStatisticsTest.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-22 15:49:15 +02:00
Lachlan Roberts 5b13006a59 Make AvailableEncoders & AvailableDecoders implement Closable.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-21 21:46:28 +10:00
Lachlan Roberts 564eea07c7 Fix header links in websocket migration guide.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-21 10:54:26 +10:00
Simone Bordet 9176d83423 Improvements to the Jetty documentation.
Clarified that HttpClient cannot be stopped from its own threads.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-20 17:41:07 +02:00
Lachlan Roberts a24a15a97a Add code example for WebSocket migration guide.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-21 00:31:12 +10:00
Simone Bordet d3a8817c76 Improvements to the Jetty documentation.
Added section about multiple key/certificate entries in a KeyStore.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-20 12:34:17 +02:00
Lachlan Roberts ab08d1a1c6 Ensure that javax.websocket Encoder/Decoder destroy method is called.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-20 11:11:05 +10:00
Ludovic Orban 25467f8904 Improve handling of HttpInput.Interceptor behavior
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-04-19 10:32:23 +02:00
Lachlan Roberts df312ccf0c Add basic migration guide for WebSocket changes between 9.4 and 10.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-19 18:28:08 +10:00
Lachlan 4c98990cd9
Create FileBufferedResponseHandler to buffer responses into a file. (#6010)
FileBufferedResponseHandler adds an HttpOutput.Interceptor to buffer all responses into a file until the output is closed. This allows the commit to be delayed until the response is complete and thus headers and response status can be changed while writing the body.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-19 11:02:44 +10:00
Simone Bordet b872c1d751 Improvements to the Jetty documentation.
Added link to Eclipse Jetty main site.
Removed unused "breadcrumb" attribute.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-16 17:04:01 +02:00
Chris Walker d825299da4
Fixing documentation pom values (#6181) 2021-04-15 18:19:50 -05:00
Lachlan dab26c601d
Merge pull request #6170 from eclipse/jetty-10.0.x-6166-MessageInputStream
Issue #6166 - fix bug in the MessageInputStream byte array read
2021-04-15 20:16:06 +10:00
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