Commit Graph

29328 Commits

Author SHA1 Message Date
Lachlan 1fb3f313ce
Merge pull request #11084 from jetty/jetty-10.0.x-11081-websocketRace
Issue #11081 - fix race condition in WebSocket FrameHandlers
2023-12-20 12:07:00 +11:00
Joakim Erdfelt 44b7cf908e
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-12-19 15:53:10 -06:00
Joakim Erdfelt e834fe7b51
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-12-19 15:49:12 -06:00
Lachlan Roberts e69f1d2bef Issue #11081 - fix race condition in WebSocket FrameHandlers
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-12-19 20:20:49 +11:00
Lachlan Roberts 592ccf7da0 Issue #11080 - copy ByteBuffer for non-retainable chunks
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-12-19 15:11:43 +11:00
Joakim Erdfelt 96eea590ee
Updating to version 12.0.6-SNAPSHOT 2023-12-18 08:25:22 -06:00
Joakim Erdfelt 3aed62e495
Updating to version 12.0.5 2023-12-18 08:05:54 -06:00
Simone Bordet e481b45cda
Follow up for issue #10933 and associated PR #10949.
Fixed HttpChannelTest.testOnFailure().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-17 13:52:09 +01:00
Lachlan 62210d39c2
add deployment exception for non Jakarta WebSocket endpoints used in ServerEndpointConfig (#11032)
* Issue #11009 - add test for bad Jakarta endpoint
* Issue #11009 - ensure endpoint deployable before adding ServerEndpointConfig
* add same test and fix for ee9

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-12-17 13:37:10 +01:00
Simone Bordet fbf8dddae4
Follow up for issue #10933 and associated PR #10949.
Most often failures come from the read side, so failure listeners are now serialized in the _readInvoker.
This avoids that a failure while parsing a request (e.g. an early EOF) results in concurrent executions of the invokeOnContentAvailable task and the invokeOnFailureListeners task.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-17 13:33:59 +01:00
Joakim Erdfelt fd81c80194
Updating to version 11.0.20-SNAPSHOT 2023-12-15 15:09:03 -06:00
Joakim Erdfelt f781e475c8
Updating to version 11.0.19 2023-12-15 14:54:13 -06:00
Joakim Erdfelt c91e3fbc48
Updating to version 10.0.20-SNAPSHOT 2023-12-15 14:49:33 -06:00
Joakim Erdfelt 8492d1c78f
Updating to version 10.0.19 2023-12-15 14:38:06 -06:00
Simone Bordet c5e40f5d90 Implemented server-side reset of the stream using error code NO_ERROR in case the request content is not read.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-15 18:23:06 +01:00
Joakim Erdfelt de5dffef39
Merge pull request #11070 from jetty/fix/12.0.x/ee8-ee9-nested-handler-impl-testing
Add Testcase for ee8/ee9 nested HandlerCollection
2023-12-15 11:13:48 -06:00
Joakim Erdfelt 15c3369b16
Issue #10852 - Add ResourceHandler.setUseFileMapping(boolean) feature (#11071) 2023-12-15 11:12:26 -06:00
Joakim Erdfelt 499c71dec5
Add missing license header on new testcase 2023-12-15 08:28:46 -06:00
Joakim Erdfelt 13d9277fa1
Add Testcase for ee8/ee9 nested HandlerCollection 2023-12-15 08:21:01 -06:00
Lachlan 35af2d8984
Do not use HttpStream.Wrapper in SizeLimitHandler (#11051)
* Do not use HttpStream.Wrapper in SizeLimitHandler
* Updated the SizeLimitHandlerServletTest
* Udpated documentation and javadocs.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-15 15:11:57 +01:00
Simone Bordet eb1e9eb8c4
Fixes #11016 - Jetty 12 IllegalStateException when stopping Server wi… (#11017)
* Made ServletChannel error handling more robust.
A failure in error handling is now remembered so that the Handler callback can be failed later.
* Avoid failing the Handler callback from ServletChannel.abort(), as it is too early: should be failed when processing the TERMINATED state, similarly to when it is succeeded.
* Removed dead code from HttpConnection.SendCallback.reset(), since response is always non-null.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-15 15:09:20 +01:00
Simone Bordet 3167e0cb6e
Fixes #11037 - Serialize HttpClient request failures (#11038)
* Introduced IteratingCallback.abort(Throwable) to serialize calls to onCompleteFailure().
* HttpSender now uses IC.abort() to serialize the abort of the request.
* Fixed HTTP/2 and HTTP/3 to dispatch the sending of the request to another thread, to free the reader thread that read the server preface.
* HTTP/1.1 does not need this, because just created connections do not need to read.
* Improved handling of request abort, as it can be from two sides: external and internal.
* Calling abort() instead of failed() for WebSocket flushers.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-15 14:44:15 +01:00
Joakim Erdfelt fa7ea8a13c
Merge pull request #11067 from kohlschuetter/pr/11066
Fixes #11066 - URIUtilTest.testFileUriGetUriLastPathSegment on macOS
2023-12-15 06:35:07 -06:00
Jan Bartel 16661b419f Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-12-15 17:52:17 +11:00
Jan Bartel 10235a01b3
Update to cdi-api 3.0.1 (#11059) 2023-12-15 07:42:29 +01:00
Greg Wilkins f776d3e4fb
Issue #10933 - Fix AsyncIOServlet test issues (#10949)
* Call ServletChannelState.asyncFailure from error listener. Fix #10933
* Separate invokers for read side and write side
* document async error issues
* updates from review
* updates from review
2023-12-15 10:34:03 +11:00
Christian Kohlschütter 665f61a3e7 Fixes #11066 - URIUtilTest.testFileUriGetUriLastPathSegment on macOS
We special-cased this test on macOS to support NFD form normalization.

That may no longer be necessary, and therefore the test currently fails.

Run the default expectations, and, in case of failure on macOS, test
against the old workaround.
2023-12-14 22:25:29 +01:00
Joakim Erdfelt 2812023db3
Issue #11040 - Deprecate PathResource.SUPPORTED_SCHEMES (#11057)
* Using ResourceFactoryInternals.isSupported(URI) instead.
2023-12-14 13:54:11 -06:00
Simone Bordet 8f019b96b0 Fixes #11064 - Jetty 12: NPE if MultiPartFormData.setFilesDirectory() is not called.
Now trying to use $JETTY_BASE/work, otherwise throwing IllegalArgumentException with a descriptive message.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-14 19:44:05 +01:00
Simone Bordet 3681d771da
Fixes #10945 - Flaky test ServletTest.testSimpleIdleRead (#11063)
Increased idle timeout durations, as 250ms is too short for CI, in both ee9 and ee10.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-14 19:25:54 +01:00
Ludovic Orban d974c4d798
Improve the dump output of ConcurrentPool (#11036)
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-12-14 19:24:53 +01:00
Simone Bordet 583bf0a28f Added tests to set the encoder/decoder dynamic table size to zero.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-14 09:17:26 +01:00
Olivier Lamy d49f298c7f
jasper jsp 9.0.83.1 (#11060)
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-12-14 14:37:00 +10:00
Jan Bartel 6d5216650a
Issue #11047 Update EE8 to Apache Jasper 9.0.83.1 (#11053)
* jasper jsp 9.0.83.1

Signed-off-by: Olivier Lamy <olamy@apache.org>

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Olivier Lamy <olamy@apache.org>
2023-12-14 05:19:29 +01:00
Jan Bartel b3869ee5f8
Issue #11045 update Apache Jasper 10.1.16 (#11050) 2023-12-13 23:40:34 +01:00
Joakim Erdfelt f96b0d5817
Merge pull request #11052 from jetty/jetty-12.0.x-11046-jasper-10.0.27
Issue #11046 Update EE9 to Apache Jasper 10.0.27
2023-12-13 14:36:05 -06:00
Simone Bordet e259dfaa81
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-13 21:32:26 +01:00
Simone Bordet 458730a4e1
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-13 20:37:31 +01:00
Simone Bordet efda646319
Fixes #11031 - HttpClient should expose Connection/EndPoint used by H… (#11033)
Introduced method Request.getConnection() to expose the Connection after at the request begin event.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-13 20:34:52 +01:00
Jan Bartel d926380651
Refactor eeX plus.security and plus.annotation classes to core (#11030)
* Refactor eeX plus.security and plus.annotation classes to core
2023-12-13 06:34:55 +01:00
Jan Bartel 3c155c22bb Issue #11046 Update EE9 to Apache Jasper 10.0.27 2023-12-13 16:24:11 +11:00
Jan Bartel 1b12160aeb
Issue #11044 update to Apache Jasper 10.0.27 (#11049) 2023-12-13 06:19:57 +01:00
Jan Bartel 006f8f75c5 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-12-13 16:18:36 +11:00
Jan Bartel e2de56f643 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-12-13 16:17:40 +11:00
Jan Bartel fcf50ff624
Issue #11043 Update to Apache Jasper 9.0.83 (#11048) 2023-12-13 06:15:54 +01:00
Jan Bartel 854bf2e0ee Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-12-13 16:14:48 +11:00
Jan Bartel b717b6327e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-12-13 15:31:15 +11:00
Jan Bartel 4df28ebac8
Issue #11039 duplicate durable listeners on maven restart (#11042) 2023-12-13 05:24:21 +01:00
Simone Bordet 9888c67a11
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-12 20:25:17 +01:00
Simone Bordet 0088ca8983
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-12-12 20:24:34 +01:00