Commit Graph

27007 Commits

Author SHA1 Message Date
Joakim Erdfelt 8eb10b2d74
Jetty 12 - Introduce PathMappingsHandler (#8748)
* Introduce PathMappingsHandler
2022-10-25 10:04:33 -05:00
Simone Bordet 05e1722045
Relax test case assert.
The test may fail either for a SocketTimeoutException, or a NoRouteToHostException.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-25 15:53:07 +02:00
Simone Bordet 18c3bf3344
Merge pull request #8758 from eclipse/jetty-12-static-pathInContext
Jetty 12 static path in context
2022-10-25 15:44:19 +02:00
Simone Bordet cf366b3323
Improved javadocs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-25 15:42:49 +02:00
Greg Wilkins 58bfda7cf9 replaced getPathInContext with static method
updates from review
2022-10-25 21:47:21 +11:00
Greg Wilkins 3b2d4048fd replaced getPathInContext with static method
updates from review
2022-10-25 21:11:10 +11:00
Greg Wilkins 9dc9eaa711 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12-static-pathInContext 2022-10-25 20:42:25 +11:00
Simone Bordet 67c36207c2
Merged branch 'cowwoc-jetty-12.0.x-8723-provide-a-thread-safe-way-to-modify-proxies-at-runtime' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-25 10:32:07 +02:00
Gili Tzabari 0724d1090d
Fixes #8723: Provide a thread-safe way to modify HttpClient proxies at runtime. 2022-10-25 10:23:04 +02:00
Simone Bordet 1119e8b509
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-25 09:59:55 +02:00
Simone Bordet ff3b14d01b
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-25 09:55:45 +02:00
Simone Bordet 94c6e63b76
Merged branch 'cowwoc-jetty-10.0.x-8723-provide-a-thread-safe-way-to-modify-proxies-at-runtime' into 'jetty-10.0.x'. 2022-10-25 09:54:02 +02:00
Simone Bordet 5973ce2941
Small additional fixes.
* Removed "since" attribute (it's commonly related to Java versions) to avoid confusion.
* Avoid using getProxies() to modify the Proxy object in ProxyServletTest.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-25 09:52:55 +02:00
Lachlan Roberts 7752720861 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-10-25 16:44:53 +11:00
Lachlan Roberts 02e0a3993c cannot add ContentFactory to servletContext attribute as there may be multiple factories in a single context
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-25 16:39:42 +11:00
Greg Wilkins 6c9d34c26a Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12-static-pathInContext
# Conflicts:
#	jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java
2022-10-25 09:11:40 +11:00
Gili Tzabari e2e59478ce Update in response to PR comments. 2022-10-24 13:17:25 -04:00
Gili Tzabari 48b89bdc2a Fixing checkstyle errors. 2022-10-24 13:04:14 -04:00
Gili Tzabari d50510a1fe Fixes #8723: Provide a thread-safe way to modify HttpClient proxies at runtime. 2022-10-24 13:04:14 -04:00
Simone Bordet 660093ff3a
Code cleanups.
Removed obsolete oej.server.HttpTransport.
Cleaned up ConnectionMetaData.Wrapper.
Simplified ee10 DefaultServlet.ServletCoreRequest.
Other minor cleanups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-24 16:25:53 +02:00
Greg Wilkins 31e4a8234f replaced getPathInContext with static method 2022-10-24 23:36:02 +11:00
Greg Wilkins 3598d7eb45 replaced getPathInContext with static method 2022-10-24 23:34:35 +11:00
Greg Wilkins b627814a7b
Implement ErrorPageErrorProcessor to resolve #8726 (#8736) 2022-10-24 21:25:38 +11:00
Greg Wilkins 14d912c654 replaced getPathInContext with static method 2022-10-24 21:02:18 +11:00
Greg Wilkins 465ddf0932 WIP replacing getPathInContext with static method 2022-10-24 17:55:16 +11:00
Greg Wilkins b25f69806c WIP replacing getPathInContext with static method 2022-10-24 16:30:09 +11:00
Greg Wilkins 30401d8cf8 WIP replacing getPathInContext with static method 2022-10-24 11:26:50 +11:00
Greg Wilkins 1885df7e03 WIP replacing getPathInContext with static method 2022-10-23 22:36:15 +11:00
Greg Wilkins 128a615773 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12-static-pathInContext 2022-10-23 20:00:45 +11:00
Simone Bordet 76ca392917
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-22 15:11:26 +02:00
Simone Bordet 70ea0a235a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-22 15:10:16 +02:00
Simone Bordet a6afbaf470
Merge pull request #8756 from janvojt/fix/jetty-10-npe-with-destination-idle-timeout
Issue #8753 - Fix HttpClient initialization with destinationIdleTimeout set.
2022-10-22 15:09:36 +02:00
Jan Vojt 1f8b0c75a4 Issue #8753 - Fix HttpClient initialization with destinationIdleTimeout set.
Signed-off-by: Jan Vojt <jan@vojt.net>
2022-10-21 15:45:46 +02:00
Ludovic Orban 502cc77da9 fix ContentSourceTransformer demand() to serialize callback invocations and delegate demand to the raw source only when needed
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-10-21 15:43:16 +02:00
Ludovic Orban 38289e46d4
Make Client's Request and Response `abort()` fully async (#8725)
Changed Request and Response abort() to be fully async by returning a CompletableFuture<Boolean>

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-10-21 15:32:46 +02:00
Lachlan 30138e9d03
Merge pull request #8742 from eclipse/jetty-12.0.x-websocket-disabled-tests
Re-enable and fix websocket tests for Jetty 12 ee9 and ee10
2022-10-21 13:08:55 +11:00
Lachlan Roberts 964108facb ResourceHandlerTest should validate cache entry on every request
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-21 11:47:53 +11:00
Lachlan Roberts 98c6675159 fix bugs in CachingHttpContentFactory, ResourceService and FileMappedHttpContentFactory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-21 11:42:03 +11:00
Greg Wilkins ac6abb307d
ResourceHandler set base resource as string (#8735)
* ResourceHandler set base resource as string

* ResourceCollection should not have a path

fixed tests
2022-10-21 09:32:54 +11:00
Joakim Erdfelt 2fc83a1e61
Drop the word "uncommon" 2022-10-20 16:58:51 -05:00
Joakim Erdfelt 3980958949
Change Server.ServerContext to package-private 2022-10-20 16:58:24 -05:00
Greg Wilkins ba48d5a82f Merge branch 'fix/jetty-12-contexthandler-deep-test' of github.com:eclipse/jetty.project into fix/jetty-12-contexthandler-deep-test 2022-10-21 08:49:27 +11:00
Greg Wilkins 02aab52daa Added javadoc 2022-10-21 08:48:36 +11:00
Joakim Erdfelt 578d921b24
Adding missing license header 2022-10-20 16:38:55 -05:00
Joakim Erdfelt 10305412c6
Use request.getContextPath() instead. 2022-10-20 16:35:26 -05:00
Joakim Erdfelt 4c0c2a6988
Reverting ContextHandler.Context change 2022-10-20 16:33:44 -05:00
Joakim Erdfelt 0b542dc29b
Applying suggestions from @gregw in issue #8749 2022-10-20 16:30:58 -05:00
Joakim Erdfelt f359023f06
Adding more to ContextHandlerDeepTest 2022-10-20 12:31:28 -05:00
Joakim Erdfelt 3174cfec89
Adding ContextHandlerDeepTest 2022-10-20 11:58:44 -05:00
Joakim Erdfelt 5b91e70c1b
Simplify resolve(String) a bit (#8741) 2022-10-20 06:22:21 -05:00