Commit Graph

426 Commits

Author SHA1 Message Date
Joakim Erdfelt 0e25d98a9d
Handle bad ContextHandler.setBaseResource more clearly 2022-10-17 15:10:55 -05:00
Joakim Erdfelt 3ed1b2b94a
Minor IOTest cleanup 2022-10-17 15:10:18 -05:00
Simone Bordet a6f5e1fe8f
Merge pull request #8705 from eclipse/jetty-12.0.x-reenable-customrequestlog
Jetty 12 - Re-enabled RequestLog tests.
2022-10-14 10:30:12 +02:00
Joakim Erdfelt 45e706cb67
Move Resource.combine() methods to ResourceFactory 2022-10-13 14:08:21 -05:00
Joakim Erdfelt 83823d8a68
More reliable tests (on windows) 2022-10-13 09:52:31 -05:00
Joakim Erdfelt 8a216c2bb4
Cannot test isContainedIn with null resource 2022-10-13 09:51:02 -05:00
Joakim Erdfelt 454ec0640e
More safety checks on null/empty/blank input params 2022-10-13 09:50:43 -05:00
Joakim Erdfelt 7b15479f3d
Use ResourceFactory managed by ContextHandler 2022-10-13 09:48:34 -05:00
Joakim Erdfelt 30be317df6
import cleanup 2022-10-13 09:48:08 -05:00
Joakim Erdfelt c32fc4972e
Use unwrapContainer instead 2022-10-13 09:47:26 -05:00
Joakim Erdfelt 4ac4b46973
Fix test-keystore order and behavior 2022-10-13 09:46:59 -05:00
Joakim Erdfelt 59f36172e9
Better NPE check on add all resources 2022-10-13 09:18:47 -05:00
Simone Bordet 01d07569a2
Updates after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-12 20:21:58 +02:00
Joakim Erdfelt 5ee1d91ba2 Fixing jetty-util Tests on Windows 2022-10-12 11:46:57 -05:00
Simone Bordet 557696653d
Re-enable RequestLog tests.
Re-implemented features that were commented out.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-12 17:46:49 +02:00
Ludovic Orban 3e78f82c9e Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-10-10 19:21:01 +02:00
Simone Bordet d3d83d0028
Merged PR #7800 to `jetty-12.0.x`.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-10 16:32:26 +02:00
Simone Bordet 4532161b13
Merged PR #7563 to `jetty-12.0.x`.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-10 15:57:52 +02:00
Joakim Erdfelt 73faf92808
Merge pull request #8630 from eclipse/jetty-12-resource-collection-only-dirs
Jetty 12 - Restrict `ResourceCollection` to only hold directory entries
2022-10-10 07:00:23 -05:00
Olivier Lamy b1f8019860
simplify poms, add back missing changes from #7850 and #7687 (#8697)
* simplify poms, add back missing changes from #7850
* remove non used plugin, missing from #7687


Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-10-10 12:52:40 +10:00
Olivier Lamy 1f792d48d0 fix javadoc error in http2 Stream class, enable back building javadoc in Jenkinsfile
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-10-09 07:59:24 +10:00
Joakim Erdfelt 5c863ccfee
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12-resource-collection-only-dirs 2022-10-07 13:52:34 -05:00
Simone Bordet c785f08b17
[Jetty 12] Made WebSocket over HTTP/2 work. (#8685)
* Made WebSocket over HTTP/2 work.

Re-enabled tests, and restored HTTP2StreamEndPoint,
as well as implemented getTunnelSupport() for HTTP/2.

Removed from HttpStream methods for upgrade that are
not necessary anymore.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-07 12:50:42 +02:00
Joakim Erdfelt fd8863d196
Merge pull request #8691 from eclipse/fix/jetty-12-octect-typo
Jetty 12 - Fix typo "octect" -> "octet"
2022-10-07 05:21:45 -05:00
Joakim Erdfelt bfadf5e8e7
Issue #7617 - RequestLog content params extraction prevention (#7618) 2022-10-06 13:16:49 -05:00
Joakim Erdfelt 0b05425aa5
Issue #5681 - clearer warning on JVM Arg / System Property use (#7769)
- Improved warning on unrecognized Command Line Options

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-10-06 12:01:37 -05:00
Joakim Erdfelt 660f601f21
Issue #5965 - fixing invalid dot output from start.jar (#7606)
* Adding testcase that can use `dot` if it exists on the machine.
2022-10-06 11:41:50 -05:00
Joakim Erdfelt e6ac065966
Fix typo "octect" -> "octet" 2022-10-06 11:28:12 -05:00
Joakim Erdfelt ad337f1fda
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-10-06 07:32:48 -05:00
Olivier Lamy eb9d07378a
move flatten mojo configuration in top pom, fix boms and remove non needed content (#8686)
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-10-06 06:50:45 +10:00
Joakim Erdfelt c5c5da63e4
Remove "mixed" content ResourceListingTest methods that mix Directory and non-directory together in a ResourceCollection 2022-10-05 13:03:38 -05:00
Simone Bordet 7ed59f46c8
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-05 12:16:02 +02:00
Lachlan 05a4b96632
Merge pull request #8621 from eclipse/jetty-12.0.x-CachedContentFactory
Fix Caching ContentFactories in Jetty-12
2022-10-04 18:57:29 +11:00
Simone Bordet a3f2268766
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-03 18:28:36 +02:00
Lachlan Roberts 1c9ac9c846 Update javadoc for CachingContentFactory.isCacheable()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-30 10:34:25 +10:00
Joakim Erdfelt a88f83d4fc
Experiment to see what happens if ResourceCollection can only hold directories 2022-09-29 16:32:23 -05:00
Lachlan Roberts 98f9deed43 remove parent from CachingContentFactory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-29 22:20:00 +10:00
Lachlan Roberts 1508eb61e7 keep the ETag header in ServletContextResponse.resetContent if Response is 304
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-28 10:50:03 +10:00
Joakim Erdfelt 97eedaf9a6
Jetty 12 - Delay Resource Alias calculation until it's requested/needed (#8573)
* Delay Resource alias calculation until it's requested.
* Rename .getAlias() to .getTargetURI()
* PathResource resolveTargetAliasPath to resolveTargetPath
2022-09-27 13:03:47 -05:00
Joakim Erdfelt d73252a28c
Jetty 12 : `ResourceListing` produces XHTML (and is validated in test cases) (#8471)
* Produce XHTML output with tests that validate the XHTML.
* Adding ResourceListingTest and ensuring ResourceListing output is well formed.
* Introduce non-directory entry in ResourceListing test for ResourceCollection
2022-09-27 11:42:05 -05:00
Lachlan Roberts ae071c5a99 release precompressed content buffer in PrecompressedHttpContent & use HttpContent.ContentFactory for parent in CachingContentFactory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-27 22:18:54 +10:00
Simone Bordet 760257a06f
Merge pull request #8620 from eclipse/jetty-12.0.x-completable-with
Introduced [Callback|Promise]Completable.with(Consumer) to simplify u…
2022-09-27 14:18:35 +02:00
Simone Bordet 70e4ccdaa6
Fixes the case where HTTP/2 readData() was returning EOF
that could not be wrapped in a Chunk, because Data.EOF.retain()
throws UnsupportedOperationException.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-27 14:15:42 +02:00
Simone Bordet b5541d9fb8
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-27 12:47:38 +02:00
Lachlan Roberts c58f769117 refactor test for resource lastModified comparisons
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-27 14:15:12 +10:00
Lachlan Roberts c5b4ddee87 Fix ETag header in 304 responses for ResourceService, provide precompressedFormats to DefaultServlet
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-27 12:40:23 +10:00
Lachlan Roberts bed034c22d more fixes for test cases in DefaultServletTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-27 11:01:56 +10:00
Simone Bordet 06be091089
Introduced [Callback|Promise]Completable.with(Consumer) to simplify usage of CompletableFuture APIs.
Updated code to use the new APIs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-26 22:15:17 +02:00
Simone Bordet f8f60822a7
Restored interim responses functionality (100 Continue, 102 Processing, 103 Early Hints) (#8615)
* Restored interim responses functionality (100 Continue, 102 Processing, 103 Early Hints) for core, ee9 and ee10.

Added ProcessingProtocolHandler and EarlyHintsProtocolHandler for the client.

Re-enabled all tests for interim responses for all protocols.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-26 16:48:11 +02:00
Lachlan Roberts c6305ff36c Improvements to CachingContentFactory for Jetty 12
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-26 16:33:50 +10:00