Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,307 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

88 Commits

Author SHA1 Message Date
Simone Bordet 3b1f38e592
Merged branch 'jetty-12.0.x' into 'jetty-12.1.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2024-09-20 16:00:12 +02:00
gregw acb30ab98a Merge branch 'jetty-12.0.x' into jetty-12.1.x 2024-09-19 09:41:12 +10: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 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
Lachlan Roberts cc5fea5c3a
Changes from #12236 for EE11 
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
 2024-09-06 00:04:12 +10: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 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
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 494d71a7ac Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-08-30 17:28:04 +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
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 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
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
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
Jan Bartel a72ae7007b Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-08-21 09:35:27 +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
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
Jan Bartel 8c276f54d0 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-08-04 17:03:52 +10:00
Joakim Erdfelt 73c358affb
Updating ee11 from ee10 2024-08-03 05:33:47 -05: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
Jan Bartel d43da5279c Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-07-24 16:10:27 +10:00
Jan Bartel b1b2adcaf9 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-07-24 11:32:52 +10:00
Jan Bartel 0ed14746f7 Fix ee11 session CreationTest to be same as ee10. 2024-07-24 11:29:45 +10:00
Ludovic Orban 13db002f9a
apply merged ee10 changes to ee11 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2024-07-19 11:15:37 +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
Greg Wilkins b0b204cb35
Define a Package in EE11 WebAppClassLoader (#12028) 
Define a Package in EE11 WebAppClassLoader
 2024-07-15 09:36:28 +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
gregw ac6c49b34f Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 
# Conflicts:
#	jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java
#	jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayByteBufferPool.java
#	jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/BufferedContentSink.java
#	jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ContextScopeListenerTest.java
#	jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpOutput.java
 2024-07-08 17:01:50 +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
gregw 98aa755dd8 Cleanup imports 
Added script to compare ee10 with ee11
 2024-06-25 15:47:59 +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
Jan Bartel 5e77a36140 Add missing environment props for some demos. 2024-06-24 12:16:32 +10:00