24ce284e04
add return to BufferUtil.readFrom javadoc
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-10 10:43:58 +11:00
387d380f75
fixes to the CachingHttpContentFactory caching algorithm
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-10 10:42:58 +11:00
08c47f5f57
Jetty 12 - use JVM provided null OutputStream ( #8789 )
...
* Remove IO.getNull* methods and use JVM versions
+ This also honors the open/close/error on
bad use of the streams/writers
2022-11-09 07:06:43 -06:00
0e3f3ac316
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-09 12:14:29 +01:00
3d96b4b7d0
fix javadoc
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-09 14:52:17 +11:00
890d02568c
use double checked locking for FileMappedHttpContent
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-09 14:43:42 +11:00
5fec1801f5
add getters and setters for HttpContentFactory onto ResourceHandler
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-09 14:20:52 +11:00
a4e773a7ab
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-09 14:10:49 +11:00
aa9df2a402
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2022-11-08 18:16:45 -06:00
bb3355be83
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-08 22:26:39 +01:00
75f210d20b
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor
2022-11-08 21:22:53 +11:00
489da47a38
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-08 18:17:37 +11:00
4225544222
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-07 19:34:43 +01:00
b3505ae687
Jetty 12 - General cleanup of URIUtil ( #8861 )
...
+ Removal of __CHARSET
+ Removal of unused methods
+ Using new switch/case concepts
+ cleanup of URIUtil constants
+ cleanup of URIUtil methods
+ collapse separate methods
+ simplify encodePath()
* Javadoc updates
* equalsIgnoreEncoding cleanup (no longer used by Resource layer)
2022-11-04 14:28:53 -05:00
41e9842921
Fixes #8858 - Jetty 12 Review MovedContextHandler. ( #8859 )
...
* Fixes #8858 - Jetty 12 Review MovedContextHandler.
Updated method names to avod references to Servlet concepts.
Added test cases.
Updated XML files.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-03 16:13:46 +01:00
7bb3fcae03
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor
2022-11-03 18:13:02 +11:00
d94abe3f3f
fix javadoc in ValidatingCachingContentFactory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 18:10:39 +11:00
4ad42e3cdb
add getBytesOccupied method to HttpContent
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 18:00:03 +11:00
c0bb0272f7
fix release in CachingHttpContentFactory and always use ByteBufferPool
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 17:38:22 +11:00
e2b00bd4e0
Improved non-blocking algorithm of AdaptiveExecutionStrategy.
...
Now only starting one pending producer also in case of CAS failures.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-02 11:19:08 +01:00
ac2d54aa17
do not cache notFound entries in TryPathsHandlerTests ResourceHandler
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-02 17:54:16 +11:00
6facedba75
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor
2022-11-02 17:28:42 +11:00
e28a528165
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-02 17:21:44 +11:00
deb4f3a8e8
Suppress stack in expected warning
2022-11-02 14:42:28 +11:00
8e699866ef
Suppress stack in expected warning
2022-11-02 14:37:35 +11:00
7e88b8234c
Experiment with lock free AdaptiveExecutionStrategy ( #8762 )
...
Removed the lock from the AdaptiveExecutionStrategy in favour of a BiInteger.
2022-11-02 08:16:24 +11:00
976ab3df8d
ResourceCollection should not have a path ( #8711 )
...
ResourceCollection should not have a path
Nor name, nor filename unless all resources agree on it.
revert combine and related methods to return Resource and not explicitly a ResourceCollection, as if there is only 1, then a collection is not needed
cleanup ResourceCollection creation. Avoid sanity checks on resolved resources.
2022-11-01 15:54:50 +11:00
4225054b62
Improve comments
2022-11-01 11:16:57 +11:00
47d2b062f0
Jetty 12 - Fix demo-ee10 `LikeJettyXml` (and testcase) ( #8771 )
...
* Remove DebugBinding config (doesn't exist anymore)
* Make LikeJettyXml work (and test)
2022-10-31 11:57:05 -05:00
dee5d14130
Jetty 12 - Alternate `TryPathsHandler` based on `Request.Processor` existence ( #8781 )
...
Now using TryPathsHandler with a PathMappingsHandler.
Introduced original[Path|Query]Attribute.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-28 17:06:52 +02:00
3e9bebd05a
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-28 16:20:17 +02:00
72d2724906
Fixed build with Java 17+.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-27 11:40:37 +02:00
6ca9c4f878
Fixed test case.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-27 10:46:40 +02:00
af19607f1c
use name annotation for EvictingCachingContentFactory constructors
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-26 11:26:06 +11:00
508e0a4484
fixing compilation
2022-10-25 15:32:58 -05:00
8eb10b2d74
Jetty 12 - Introduce PathMappingsHandler ( #8748 )
...
* Introduce PathMappingsHandler
2022-10-25 10:04:33 -05:00
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
cf366b3323
Improved javadocs.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-25 15:42:49 +02:00
58bfda7cf9
replaced getPathInContext with static method
...
updates from review
2022-10-25 21:47:21 +11:00
3b2d4048fd
replaced getPathInContext with static method
...
updates from review
2022-10-25 21:11:10 +11:00
9dc9eaa711
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12-static-pathInContext
2022-10-25 20:42:25 +11:00
0724d1090d
Fixes #8723 : Provide a thread-safe way to modify HttpClient proxies at runtime.
2022-10-25 10:23:04 +02:00
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
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
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
31e4a8234f
replaced getPathInContext with static method
2022-10-24 23:36:02 +11:00
3598d7eb45
replaced getPathInContext with static method
2022-10-24 23:34:35 +11:00
b627814a7b
Implement ErrorPageErrorProcessor to resolve #8726 ( #8736 )
2022-10-24 21:25:38 +11:00
14d912c654
replaced getPathInContext with static method
2022-10-24 21:02:18 +11:00
465ddf0932
WIP replacing getPathInContext with static method
2022-10-24 17:55:16 +11:00
b25f69806c
WIP replacing getPathInContext with static method
2022-10-24 16:30:09 +11:00
30401d8cf8
WIP replacing getPathInContext with static method
2022-10-24 11:26:50 +11:00
1885df7e03
WIP replacing getPathInContext with static method
2022-10-23 22:36:15 +11:00
128a615773
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12-static-pathInContext
2022-10-23 20:00:45 +11:00
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
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
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
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
98c6675159
fix bugs in CachingHttpContentFactory, ResourceService and FileMappedHttpContentFactory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-21 11:42:03 +11:00
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
2fc83a1e61
Drop the word "uncommon"
2022-10-20 16:58:51 -05:00
3980958949
Change Server.ServerContext to package-private
2022-10-20 16:58:24 -05:00
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
02aab52daa
Added javadoc
2022-10-21 08:48:36 +11:00
578d921b24
Adding missing license header
2022-10-20 16:38:55 -05:00
10305412c6
Use request.getContextPath() instead.
2022-10-20 16:35:26 -05:00
4c0c2a6988
Reverting ContextHandler.Context change
2022-10-20 16:33:44 -05:00
0b542dc29b
Applying suggestions from @gregw in issue #8749
2022-10-20 16:30:58 -05:00
f359023f06
Adding more to ContextHandlerDeepTest
2022-10-20 12:31:28 -05:00
3174cfec89
Adding ContextHandlerDeepTest
2022-10-20 11:58:44 -05:00
5b91e70c1b
Simplify resolve(String) a bit ( #8741 )
2022-10-20 06:22:21 -05:00
0e1bae4059
use RetainableByteBuffer for getBuffer in HttpContent
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-20 21:29:55 +11:00
8768725de9
separate evicting logic from CachingHttpContentFactory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-20 10:37:38 +11:00
86da43a54a
improve configuration options for HttpContent.Factory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-20 10:00:04 +11:00
259deea2f7
Jetty 12 - Resource `resolve()` and `newResource()` return null on resources that do not exist ( #8702 )
...
* Resource `resolve()` and `newResource()` return null on resources that do not exist
* Introduce `Resources` utility methods and use them
* Updating javadoc
2022-10-19 15:50:37 -05:00
ed3d4a46c7
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-19 18:36:25 +02:00
9061348ec4
Jetty 12 - Simplification of aliases in `PathResource` (Take 2) ( #8734 )
...
* simplify the PathResource.resolveTargetPath code
* changes to how PathResource handles aliases
* fix usages of Resource.getTargetUri()
* fixes for FileSystemResourceTest
* update javadoc for Resource.getTargetURI()
* rename getTargetURI to getCanonicalURI
* let resolveCanonicalPath return null if resource does not exist
* add test in PathResourceTest for broken symlinks
* some changes from review + optimization for exists()
* restore name to getTargetUri in Resource
* fix some tests related to PathResource changes
* revert changes to PathResource equals and hashcode
* also compare URI in PathResource
* checkAlias to resolveAlias
* PathResource cleanup
+ Adding comments about class fields.
+ Removing normalization from
input/output/comparison flows.
+ Collapsing `resolveTargetPath`
into `resolveAlias` to react
accordingly to the exceptions
that can flow out of Path.toRealPath().
+ Failure on Path.toRealPath() is never
an alias, as the resource cannot ever
be served anyway.
+ More comments in `resolveAlias()`
+ Failed / Bad / Nonexistent / Inaccessible
resources are not aliases to anything.
* Renames of targetPath/targetUri
`targetPath` to `realPath`
`targetURI` to `realURI`
* Cleanup alias/aliasResolved booleans
* More testcase cleanup around not-exist
* Don't resolve alias on Error during toRealPath
* Add test to check how Alias check behaves if non-existent resource exists later
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-19 11:17:23 -05:00
6ba81ce10d
Restored parameter-less constructors, as they are useful when used in XML.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-19 11:06:28 +02:00
3c08931291
cleanups of HttpContent factories
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-19 17:50:06 +11:00
ad7ae3cfc9
Rename all HttpContent factories
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-19 17:10:15 +11:00
bbd7ace07e
fix failing test cases for ResourceService and Etags
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-19 09:36:06 +11:00
ad406ac44c
Cleaning up test cases with eye on work/temp file management
2022-10-18 07:50:44 -05:00
b10e357902
Use Resource.newReadableByteChannel() instead
2022-10-18 07:50:11 -05:00
cccc16c03e
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor
2022-10-18 22:28:13 +11:00
b10e25b683
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2022-10-18 09:30:37 +02:00
fbceb92cd0
further work on CachingContentFactory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-18 15:04:59 +11:00
586d0fd097
Merge branch 'jetty-12.0.x' of github.com:eclipse/jetty.project into jetty-12.0.x
2022-10-17 18:32:35 -05:00
0d0790834d
Moved FastCGIProxyServlet in ee9 to FastCGIProxyHandler in core. ( #8718 )
...
Moved FastCGIProxyServlet in ee9 to FastCGIProxyHandler in core.
Moved TryFilesFilter in ee9 to TryPathsHandler in core.
Update Jetty modules to properly setup the class-path in case of proxy usage.
Fixes Surefire configuration to run the tests.
The problem is that fcgi-proxy depends on fcgi-client, so both will be put on the module-path.
However, fcgi-server is used for the tests, it is in the class-path, but depends on fcgi-client that is on the module-path.
Therefore, when a fcgi-server class tries to access a fcgi-client class, JPMS throws because the fcgi-client module does not export to the unnamed module.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-18 00:00:34 +02:00
b4e84b75a4
Delay Resource creation in scenarios till actual test case execution
2022-10-17 15:28:41 -05:00
6d3bd4e8a1
Minor cleanup of FileSystemResourceTest
2022-10-17 15:25:58 -05:00
0e25d98a9d
Handle bad ContextHandler.setBaseResource more clearly
2022-10-17 15:10:55 -05:00
3ed1b2b94a
Minor IOTest cleanup
2022-10-17 15:10:18 -05:00
e910a8ea59
work in progress to improve CachingContentFactory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-17 16:07:55 +11:00
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
64a5b07424
cache more fields in CachingHttpContent
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-14 15:53:45 +11:00
45e706cb67
Move Resource.combine() methods to ResourceFactory
2022-10-13 14:08:21 -05:00
83823d8a68
More reliable tests (on windows)
2022-10-13 09:52:31 -05:00
8a216c2bb4
Cannot test isContainedIn with null resource
2022-10-13 09:51:02 -05:00
454ec0640e
More safety checks on null/empty/blank input params
2022-10-13 09:50:43 -05:00
7b15479f3d
Use ResourceFactory managed by ContextHandler
2022-10-13 09:48:34 -05:00
30be317df6
import cleanup
2022-10-13 09:48:08 -05:00
c32fc4972e
Use unwrapContainer instead
2022-10-13 09:47:26 -05:00
4ac4b46973
Fix test-keystore order and behavior
2022-10-13 09:46:59 -05:00
59f36172e9
Better NPE check on add all resources
2022-10-13 09:18:47 -05:00
57f71ce77e
extract the generation of getCompressedContentFormats to separate contentFactory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-13 18:08:50 +11:00
2d161bfecd
cleanups of HttpContentWrapper and ResourceService
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-13 17:25:47 +11:00
01d07569a2
Updates after review.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-12 20:21:58 +02:00
5ee1d91ba2
Fixing jetty-util Tests on Windows
2022-10-12 11:46:57 -05:00
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
6771db40bf
replace use of CachedContentFactory with CachingContentFactory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-12 19:20:35 +11:00
6db4bf8aa0
remove getPrecompressedContents from HttpContent and ee9 impl
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-12 18:44:00 +11:00
81f67f3fff
remove getPreCompressedContentFormats from HttpContent
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-12 18:02:34 +11:00
9f8621269c
remove usage of HttpContent.getPreCompressedContentFormats for jetty-core & ee10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-12 16:16:15 +11:00
6a6681a2df
fix stampede creating CachingHttpContent & remove usage of getPreCompressedContentFormats
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-12 16:11:33 +11:00
a7383ea4de
only check file modified time once per second for cached files
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-11 18:41:56 +11:00
1353f16d57
Refactor for CachingContentFactory and ResourceService
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-11 11:08:42 +11:00
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
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
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
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
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
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
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
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
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
bfadf5e8e7
Issue #7617 - RequestLog content params extraction prevention ( #7618 )
2022-10-06 13:16:49 -05:00
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
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
e6ac065966
Fix typo "octect" -> "octet"
2022-10-06 11:28:12 -05:00
ad337f1fda
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
2022-10-06 07:32:48 -05:00
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
c5c5da63e4
Remove "mixed" content ResourceListingTest methods that mix Directory and non-directory together in a ResourceCollection
2022-10-05 13:03:38 -05:00
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
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
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
1c9ac9c846
Update javadoc for CachingContentFactory.isCacheable()
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-30 10:34:25 +10:00
a88f83d4fc
Experiment to see what happens if ResourceCollection can only hold directories
2022-09-29 16:32:23 -05:00
98f9deed43
remove parent from CachingContentFactory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-29 22:20:00 +10:00
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
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
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
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
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
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
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
c58f769117
refactor test for resource lastModified comparisons
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-27 14:15:12 +10:00
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
bed034c22d
more fixes for test cases in DefaultServletTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-09-27 11:01:56 +10:00
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
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
Joakim Erdfelt
Simone Bordet
Greg Wilkins
Gili Tzabari
Ludovic Orban
Olivier Lamy
Olivier Lamy