Issue #3888 - Huge file Resources behaviors #3889
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
+ Allowing CachedHttpContent._contentLengthValue actually hold the `long` resource size (for the 4G variant on test) + Allowing BufferUtil to not throw Exception if resource length is a positive value, but exceeds Integer.MAX_VALUE, opting instead to return a null to prevent excessive memory usage. (fixes the 10G variant of test) Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
sbordet
requested changes
Jul 19, 2019
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/HugeResourceTest.java
Outdated
Show resolved
Hide resolved
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/HugeResourceTest.java
Outdated
Show resolved
Hide resolved
+ Only used Mapped ByteBuffers, ReadableByteChannel, or InputStream Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
+ For Content-Length values exceeding Integer.MAX_VALUE the return must be -1. Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
+ Also applying changes from review Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
+ ResourceCacheTest identified a bug in CachedContentFactory (a bad/reversed if statement) + Updated ResourceCacheTest to not rely on jetty-util src/test/resources Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
joakime
changed the title
gregw
approved these changes
Jul 26, 2019
jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java
Show resolved
Hide resolved
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Joakim Erdfelt joakim.erdfelt@gmail.com