Commit Graph

1009 Commits

Author SHA1 Message Date
gregw cac0d62f51 Merge branch 'jetty-12.1.x' into experiment/jetty-12.1.x/delayedDispatch 2024-09-19 07:55:00 +10:00
gregw 9eb9e7d38e WIP updates from review 2024-09-18 10:13:33 +10:00
Ludovic Orban 76962e966a
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-09-16 09:32:11 +02:00
Jan Bartel 5105afafa4
Issue #12241 Restore SameSite config as session cookie comment. (#12263)
* Issue #12241 Restore SameSite config as session cookie comment in ee8/9.
2024-09-16 08:48:06 +10:00
gregw b7c8bcb92f Merge remote-tracking branch 'origin/jetty-12.1.x' into experiment/jetty-12.1.x/delayedDispatch
# Conflicts:
#	jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java
#	jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/AbstractTest.java
#	jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletTest.java
#	jetty-ee11/jetty-ee11-servlet/src/test/java/org/eclipse/jetty/ee11/servlet/ServletTest.java
#	jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletTest.java
2024-09-13 08:47:18 +10:00
Joakim Erdfelt 044a3be744
Merge pull request #12245 from jetty/release/12.0.13
Merge back release 12.0.13
2024-09-11 09:45:12 -05:00
Simone Bordet 3d8a62d3b3
Merged branch 'jetty-12.0.x' into 'jetty-12.1.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-09-10 11:09:32 +02:00
Simone Bordet 24f0ac28ad Fixes #11327 - Flaky test ServletTest.testSimpleIdleRead().
Just improving the test code.
The flakyness was likely fixed by the work in #12216 and #12237.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-09-10 12:03:02 +03:00
Simone Bordet 4b40aa7116
Merged branch 'jetty-12.0.x' into 'jetty-12.1.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-09-09 17:38:00 +02:00
Simone Bordet fa0502db54
Fixes #12249 - HTTP/2 responses with Content-Length may have no content. (#12250)
Fixed HttpReceiverOverHTTP2.read() to return a failed chunk if the stream has been reset.
This closes the window where a RST_STREAM frame may be received, drain the DATA frames in HTTP2Stream, and the application reading exactly at that point.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-09-09 17:20:17 +02:00
Lachlan Roberts a5727d8e27
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-09-05 23:32:29 +10:00
Lachlan 8c5d5e8a15
Merge pull request #12186 from jetty/jetty-12.1.x-servletUpgrade
implement servlet upgrade for ee10 and ee11
2024-09-05 08:23:16 +10:00
Olivier Lamy 65e9bba44c
next snapshot
Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-09-03 21:44:43 +10:00
Olivier Lamy 816018a420
Updating to version 12.0.13 2024-09-03 13:03:43 +10:00
Lachlan 899c005e34
Merge pull request #12208 from jetty/jetty-12.0.x-11434-AliasCheckerSymlinkTests
Issue #11434 - resolve differences in AliasCheckerSymlinkTests
2024-09-03 10:02:56 +10:00
gregw 165327a1bf Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x
# Conflicts:
#	jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java
#	jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/AbstractTest.java
2024-09-03 08:04:07 +10:00
Ludovic Orban 5439f17ff6
Rework leak tracking assertions to use a common awaitility pattern (#12226)
Rework leak tracking assertions to use a common awaitility pattern

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2024-09-02 19:34:05 +02:00
Lachlan Roberts f795fb10d0
PR # 12186 - changes from review
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-09-02 15:52:53 +10:00
gregw e58eef20d7 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-09-02 11:51:07 +10:00
gregw eecf4cf555 Tagged tests as Isolated that modify the static RESOURCE_FACTORIES 2024-09-02 11:50:17 +10:00
gregw 5f21227a00 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-08-30 17:23:02 +10:00
gregw ac5ad3780f flaky test tag 2024-08-30 17:22:16 +10:00
Lachlan Roberts 677de2fe17
Merge remote-tracking branch 'origin/jetty-12.1.x' into jetty-12.1.x-servletUpgrade 2024-08-29 12:35:05 +10:00
Lachlan Roberts b6f2c869e5
PR #12186 - Make HttpConnection internal and implement a public Upgrade interface
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-29 11:44:22 +10:00
Lachlan Roberts 96a0468436
Issue #11434 - remove printlns in AliasCheckerSymlinkTest
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-29 08:47:49 +10:00
Lachlan Roberts 178a795f93
Issue #11434 - resolve differences in AliasCheckerSymlinkTests
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-29 08:28:15 +10:00
Lachlan 95547c2ac4
Merge pull request #12197 from jetty/jetty-12.1.x-openid-jettyIntegrations
Move jetty-openid module to jetty-integrations
2024-08-29 08:12:57 +10:00
gregw 1ea02673ac Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-08-28 20:29:02 +10:00
Greg Wilkins aa07995f37
sendError(-1) is an abort (#12206)
restore behaviour from jetty <= 11 where a sendError(-1) is a true abort, without an attempt to send an error response.
2024-08-28 20:24:10 +10:00
Lachlan Roberts 594a65099c
Merge remote-tracking branch 'origin/jetty-12.1.x' into jetty-12.1.x-servletUpgrade 2024-08-27 17:57:45 +10:00
Lachlan Roberts e31360dd7f
rename jetty-test-util to jetty-test-common
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-27 14:39:47 +10:00
Lachlan Roberts 063e839962
reduce duplication for OpenIdProvider testing class
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-26 11:48:10 +10:00
Lachlan c0d5adf6c6
Merge pull request #12181 from jetty/jetty-12.1.x-websocketMethodHolder
Issue #6328 - avoid binding WebSocket MethodHandles
2024-08-26 11:04:11 +10:00
Greg Wilkins 7d7eeb3b1e
Experiment with IteratingCallback (#12040)
The previous semantic of `onCompleteFailure` has been renamed to `onFailure(Throwable)`, which is called immediately (but serialized) on either an abort or a failure.   A new `onCompleteFailure(Throwable)` method has been added that is called only after a `failed(throwable)` or a `abort(Throwable)` followed by `succeeded()` or `failed(Throwable)``

No usage has yet been made of the new `onCompleteFailure`, but the ICB implementation has been completely replaced by the one developed in #11876

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2024-08-26 10:18:57 +10:00
Lachlan Roberts e9233804c8
Merge remote-tracking branch 'origin/jetty-12.1.x' into jetty-12.1.x-websocketMethodHolder 2024-08-22 13:05:37 +10:00
Olivier Lamy 2ef6a3473a
jetty 12.1.x 12184 urls fixes (#12187)
* fix proxy url in web.xml
* Issue #12184 Change urls https://eclipse.dev to https://jetty.org

Fix #12187

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

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-08-22 04:34:56 +02:00
Lachlan Roberts a9d391079c
implement servlet upgrade for ee10 and ee11
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-21 23:42:50 +10:00
Simone Bordet 8e6ad22b69
Merged branch 'jetty-12.0.x' into 'jetty-12.1.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-08-21 11:38:00 +02:00
Olivier Lamy 2ca9be96ae
change urls https://eclipse.dev to https://jetty.org (#12172)
* change urls https://eclipse.dev to  https://jetty.org

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-08-21 07:18:20 +02:00
Lachlan Roberts e486b7161f
Merge remote-tracking branch 'origin/jetty-12.1.x' into jetty-12.1.x-websocketMethodHolder 2024-08-21 14:20:43 +10:00
Lachlan Roberts e11120c3d1
Issue #6328 - avoid binding WebSocket MethodHandles
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-21 10:51:16 +10:00
Greg Wilkins 8b4e13dbea
Jetty 12.1.x 12088 core requested session ID source (#12145)
add isRequestedSessionIdFromCookie/URL for core request

Co-authored-by: Jan Bartel <janb@webtide.com>
2024-08-20 15:14:37 +10:00
Joakim Erdfelt e2753e6f5f
Add Missing changes to ee11 WebInfConfiguration (#12168)
* Missing changes to WebInfConfiguration from commit 558da27c2d

* use better matchers for files assert

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

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Olivier Lamy <olamy@apache.org>
2024-08-16 06:09:34 +02:00
Simone Bordet 775c458960
Merged branch 'jetty-12.0.x' into 'jetty-12.1.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-08-13 15:54:47 +02:00
Simone Bordet fc9cbda52f
Improved handling of 100 Continue (#12113)
* Now `HttpClient` removed the `Expect` header if there is no request content.
* Changed AbstractProxyServlet and ProxyHandler check for request content: now the Content-Type header is not taken into consideration.
* Now the server avoids sending the 100 Continue response if there is no request content.
* Now the request body is not defaulted if missing, but just kept null.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-08-13 15:06:50 +02:00
Lachlan Roberts 5ede88aade
PR #12077 - add test for DelayedHandler with multipart
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-08 10:09:08 +10:00
Ludovic Orban 347dee0ba5 - Replace ByteBufferPool + size + directness with ByteBufferPool.Sized in HttpContent-related code
- Cleanup and javadoc HttpContent
 - Align and cleanup offset/length default values

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2024-08-07 10:37:24 +02:00
gregw 5993364288 fixed removal of deprecated methods 2024-08-07 12:53:19 +10:00
gregw fb8505780c Merge remote-tracking branch 'origin/jetty-12.1.x' into experiment/jetty-12.1.x/delayedDispatch 2024-08-07 12:38:23 +10:00
Jan Bartel 661546ecff
Issue #12124 fix jsp scratchdir location for ee9. (#12129)
* Issue #12124 fix jsp scratchdir location for ee9.

Also ensure the name of war appears in the name of the tmp dir for ee9
webapps.
2024-08-06 09:11:16 +10:00