Commit Graph

45 Commits

Author SHA1 Message Date
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
Lachlan Roberts 0dc9ae7356
Merge PR #12208 to EE11
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-09-05 23:49:33 +10: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
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 e13b9ad84c
PR #12186 - changes from review
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-29 12:17:17 +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
gregw 1ea02673ac Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-08-28 20:29:02 +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
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 cb691cd3ff
PR #12186 - deprecate servletUpgrade method on HttpParser and rename to upgrade()
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-23 14:07:05 +10:00
Lachlan Roberts 0e73c563c8
add missing licence header
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
2024-08-22 13:08:43 +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
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
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
Simone Bordet f154f210f8
Issue #12023 - Remove WriteFlusher.Listener. (#12065)
WriteFlusher.Listener functionality was removed, and the class deprecated in 12.0.10 as part of the work for #9778 and #11839.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-07-29 11:33:12 +02:00
Ludovic Orban a9a0f164ca
cleanup and javadoc HttpContent (#12069)
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2024-07-25 11:59:19 +10:00
Ludovic Orban 834db77605
Implement HttpContent.writeTo() async API (#12020)
#8790 implement HttpContent.writeTo() async API

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2024-07-24 14:07:31 +02:00
Greg Wilkins 12db285f17
Remove usage of a SecurityManager from EE11 (#12032)
Use callAs rather than doAs
Disable after java 21
2024-07-15 13:32:34 +10:00
Jan Bartel f5d6d8d076
Ensure expired Set-Cookie not present on push as per spec (#12010)
* Ensure expired Set-Cookie not present on push as per spec

* Update jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java

Co-authored-by: Greg Wilkins <gregw@webtide.com>

---------

Co-authored-by: Greg Wilkins <gregw@webtide.com>
2024-07-11 07:58:04 +10:00
gregw 2e5583d7ff Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x to ee11
# Conflicts:
#	documentation/jetty-asciidoctor-extensions/pom.xml
#	documentation/jetty-documentation/pom.xml
#	jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
#	jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2024-07-10 10:21:31 +10:00
gregw ff70c0e267 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x to ee11
# Conflicts:
#	documentation/jetty-asciidoctor-extensions/pom.xml
#	documentation/jetty-documentation/pom.xml
#	jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
#	jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2024-07-10 10:21:10 +10:00
Jan Bartel 2587fe8581
Jetty 12.1.x tck error message (#12011)
* Fix for bad error message in tck test
2024-07-08 07:30:33 +02:00
Joakim Erdfelt 1bf9cbcf1a
Fixing MultiPartServletTest in ee11 2024-06-28 07:46:25 -05:00
gregw 82ab704769 update servlet push cookie handling to servlet 6.1 behaviour 2024-06-25 20:34:13 +10:00
Greg Wilkins 36538d6e69
RetainableByteBuffer as mutable (#11801)
Tweaks to the RBB API to make the concept more uniform throughout the codebase.

* Make chunk a RBB
* Added Dynamic RBB as a replacement for both Accumulator and Aggregator

---------

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2024-06-25 08:12:41 +10:00
Jan Bartel 0cb10d365b Fix check for Partitioned attribute on ee10 & ee11 cookies. 2024-06-24 16:55:49 +10:00
Greg Wilkins 1e241d8ed5
Servlet 61 cookie fixes (#11936)
* Fix #11934 Servlet 6.1 Cookies
* Added compliance mode MAINTAIN_QUOTES to keep the quotes as part of the cookie value.  Added mode RFC6265_QUOTED that includes this violation
* Never send a zero valued max-age parameter
* Partitioned is set if any attribute that is not "false" is set.
* Avoid equal sign for empty valued attributes
* Pushed responses delete max-age==0 cookies
2024-06-23 13:13:18 +10:00
Joakim Erdfelt e05e3323a6
Merge branch 'jetty-12.1.x' of github.com:jetty/jetty.project into jetty-12.1.x 2024-06-19 17:03:15 -05:00
Jan Bartel c5af1aeb3c Fix servlet spec minor version for ee11 2024-06-20 07:52:31 +10:00
Joakim Erdfelt b1c2acfc20
Fix missing notifyRemoteAsyncErrors http config wiring
(#11897)

Fixed missing notifyRemoteAsyncErrors http config wiring and add tests

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2024-06-19 16:49:07 -05:00
Joakim Erdfelt c88e8a4626
Fix openid.mod files for Jetty 12
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2024-06-19 16:48:31 -05:00
Jan Bartel 810eccaeea Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-05-28 10:23:00 +10:00
Jan Bartel c50d325dfc
Issue #11813 add tests for no-ops on Response after commit. (#11824)
* Issue #11813 add tests for no-ops on Response after commit.

* Change after review
2024-05-28 02:06:12 +02:00
Greg Wilkins a84f99b1e6
Fix #11815 HttpServletMapping (#11829)
Implemented a test that uses the examples from the javadoc
Fixed the matchValue for PREFIX matches
2024-05-25 10:35:43 +10:00
Greg Wilkins 1e95caa1ef
Implement Servlet 6.1 Error dispatch changes (#11821)
Implement Servlet 6.1 Error dispatch changes

+ Error dispatches are done as GET methods
+ New ERROR_METHOD and ERROR_QUERY_STRING attributes
+ Moved most error attributes to Dispatcher.ErrorRequest
+ removed duplicate attributes

* updates from review

* Update jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ErrorHandler.java

Co-authored-by: Jan Bartel <janb@webtide.com>
2024-05-23 14:49:00 +10:00
gregw 0e5bc9d57d merged ee10 to ee11 2024-05-23 10:27:49 +10:00
Greg Wilkins 4c1c6a2652
Implemented servlet 6.1 redirect with content (#11743)
* Implemented servlet 6.1 redirect with content

Added option for server to generate a short html redirect body content, as per RFC9110 (default false)
Allowed an aggregated servlet response content to be used if clear is false.

* Redirect is a noop in include

* Fixed init order

This style of extensibility (calling virtuals from constructors) is very fragile.

* Update javadoc from review

Also update EE10 to also noop included response methods

* Update javadoc from review

Also update EE10 to also noop included response methods

* Update javadoc from review

Also update EE10 to also noop included response methods

* Update jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiResponse.java

Co-authored-by: Jan Bartel <janb@webtide.com>

* Updating ee11 jsp-impl to 11.0.0-M19

* Updates from review

* updates from review

* Update jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>

---------

Co-authored-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2024-05-20 23:20:24 +10:00
gregw 22ddb6db77 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-05-16 17:28:29 +10:00
gregw 09f3adc66c Cleanup many warnings from ee10 and ee11 servlet 2024-05-16 17:04:13 +10:00
Jan Bartel 0177f0cae3 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-05-04 12:58:40 +10:00
Jan Bartel c20a723749 See https://github.com/jakartaee/servlet/issues/616 2024-05-01 17:48:30 +10:00
Jan Bartel fa7d8158e0 Add support for HttpSession.Accessor 2024-05-01 15:25:48 +10:00
Jan Bartel da5eee7434 Update all deps to ee11 versions 2024-05-01 11:28:09 +10:00
gregw b11996a3c4 Introduced EE11 and jetty-12.1.x 2024-04-26 22:42:57 +10:00