Commit Graph

224 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
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
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 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
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
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
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
Joakim Erdfelt d3af12957b
Updating to version 12.0.13-SNAPSHOT 2024-07-25 17:23:21 -05:00
Joakim Erdfelt cc6f1b74db
Updating to version 12.0.12 2024-07-25 16:57:59 -05: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 b1b2adcaf9 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-07-24 11:32:52 +10:00
Joakim Erdfelt ed0239b17f
More regression testing of forms on ee9 / ee8 2024-07-22 10:59:51 -05:00
Ludovic Orban 7b3e953e56
Merge remote-tracking branch 'origin/jetty-12.0.x' into merge/jetty-12.1.x/update-from-12_0 2024-07-19 11:02:16 +02:00
Joakim Erdfelt 7c42a5b3ae
Fix Regression on ee9 / ee8 MultiPart parsing (#12031)
* Regressions on ee9 / ee8 MultiPart parsing error behavior
* More testing of error regressions
* Multipart parsing errors return 400 (Bad Request) now, not 500 (Server Error).
2024-07-16 07:52:00 -05:00
gregw 8735fee1dd Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x
# 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 09:20:02 +10:00
Greg Wilkins 46204a86ff
Jetty 12.0.x resource Servlet (#11933)
Introduce ResourceServlet
* Split DefaultServlet into ResourceServlet
* Added tests for Resource and Default Servlet
* Improved documentation of the ResourceServlet
* Fixed the documentation
2024-07-10 09:05:56 +10:00
Joakim Erdfelt 347da8ed7b
Merge remote-tracking branch 'origin/release/12.0.11' into jetty-12.0.x 2024-07-03 18:35:02 -05:00
Jan Bartel b55b1f522d Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-07-01 16:21:01 +10:00
Jan Bartel c8b3373bbc
Issue #11957 Fix DefaultServletTest.testGetPrecompressedSuffixMapping (#11994) 2024-07-01 08:19:37 +02:00
gregw 5903efdf96 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-01 11:05:47 +10:00
Joakim Erdfelt f5abe07ade
Updating to version 12.0.12-SNAPSHOT 2024-06-27 19:09:24 -05:00
Joakim Erdfelt 9f90cedce3
Updating to version 12.0.11 2024-06-27 18:42:08 -05:00
Joakim Erdfelt c7ad22e861
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-06-27 06:45:25 -05:00
gregw 7ee5cfc7e8 Fix flaky ContextScopeListenerTest 2024-06-27 09:47:28 +10:00
Greg Wilkins 15bcc5ecb0
Cleanups extracted from delayed PR #11876 (#11958)
* Cleanups extracted from delayed PR #11876

* Update from review
2024-06-26 16:49:58 +10:00
Joakim Erdfelt f78f4422f5
Issue #11925 - Fix Etag NPE when using URLResource and improve Base Resource is alias warning (#11930)
* Issue #11925 - ee9 DefaultServlet and suffix url-patterns.
* Issue #11925 - Fix NPE in EtagUtils with URLResource
* Issue #11925 - Make error message "Base Resource should not be an alias" more useful.
* Set <reuseForks> to false for problematic tests.
2024-06-25 08:11:35 -05:00
Joakim Erdfelt 25bb6a2104
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-06-21 15:28:23 -05:00
Joakim Erdfelt 23aecbe3a8
Fix warnings during jetty-ee9-servlet tests 2024-06-20 14:38:15 -05:00
Jan Bartel fd263c727d
Jetty 12.0.x object identity ee8 and ee9 (#11888)
* Fix for ee8/9 object identity
2024-06-20 07:53:53 +02:00
Joakim Erdfelt af23f51d92
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-06-19 16:18:15 -05:00
Joakim Erdfelt 4f72b84c59
Cleanup ee9 DefaultServletTest
+ Fix various warnings
+ Disable ODD_JAR / extraClassPath (temporarily)
+ Reenable disabled test Test
+ Reenable disabled test testListingContextBreakout
2024-06-19 10:21:48 -05:00
Olivier Lamy fb1697fd07
Updating to version 12.0.11-SNAPSHOT 2024-05-30 15:23:16 +10:00
Olivier Lamy 26106dfc84
Updating to version 12.0.10 2024-05-30 14:39:40 +10: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
Simone Bordet e782f91ef2 Fixes #1470 - Replace Timer use with Jetty Scheduler.
Removed usages of the Timer class.

Deprecated TimerScheduler.

Code cleanup in ee10 classes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-05-27 22:38:17 +02: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
Jan Bartel 0346b0619f
Issue #11760 fix NPE getRequestURL() for cross context (#11770)
* Issue #11760 fix NPE getRequestURL() for cross context

---------

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-05-10 08:34:43 +02:00
Joakim Erdfelt 8e7e42201a
Updating to version 12.0.10-SNAPSHOT 2024-05-03 09:28:36 -04:00
Joakim Erdfelt efe8023327
Updating to version 12.0.9 2024-05-03 09:02:37 -04:00
gregw b11996a3c4 Introduced EE11 and jetty-12.1.x 2024-04-26 22:42:57 +10:00
Ludovic Orban 656e904d91
Fix buffer leak in `HttpClientStreamTest.testUploadWithConcurrentServerCloseClosesStream()` (#10431)
Fix buffer leak in HTTP and FCGI when the server is being shut down while there are in-flight requests

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2024-04-22 16:15:58 +02:00
Greg Wilkins 33feac33e7
Revert "Revert NON_POOLING change" (#11649)
This reverts commit 2bf7d6cecc.
2024-04-18 15:52:03 +10:00
Joakim Erdfelt b3ef872d6b
Updating to version 12.0.9-SNAPSHOT 2024-03-29 15:20:11 -05:00
Joakim Erdfelt ffffdcc3c8
Updating to version 12.0.8 2024-03-29 14:31:57 -05:00
Greg Wilkins 9b6944e04a
Remove usages of URIUtil.toURI and URIUtil.split (#11577)
* Issue #11567 - fix relative path for resourceBase set in DefaultServlet

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Remove the ResourceFactory adaption from between baseResource and a HttpContent.Factory

* Remove toURI usage

* ensure ee9 DefaultServlet encodes the pathInContext

* Moved toURI functionality to ResourceFactory

* use context baseResource if baseResource not set

* removed usages of URIUtil.split

* fixed javadoc

* updates from review

* updates from review

* updates from review

* updates from review

* fixed resource leak in test

* fixed resource leak in test

* updates from review

* Fixes to URIUtil for Windows (#11585)

* Fixes for Windows
* Remove test that is not needed

* inlined resolveOrNew

---------

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2024-03-28 16:32:03 +01:00
Ludovic Orban 89c41b2550
Cleanup Resource IO (#11364)
Refactorings to rationalize and simplify how we do IO with resources internally by introducing the IOResources helper.

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2024-03-28 11:08:44 +01:00
Joakim Erdfelt 05aa1e1b08
Issue #11495 - Add UriCompliance rules that follow the HTTP / URI / Servlet specs for illegal & suspicious characters (#11496)
* Issue #11495 - Add UriCompliance rules that follow the HTTP / URI / Servlet specs for illegal & suspicious characters
* more illegalPathCharacterData test cases
* Correcting SUSPICIOUS_PATH_CHARACTERS semantic (encoded and decoded)
* Check for illegal and suspicious characters as we are parsing the path.
* Only look for ambiguous paths if we know there are dots or encodings.

---------
Co-authored-by: gregw <gregw@webtide.com>
2024-03-27 09:28:30 -05:00