Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet #10735
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
…karta.servlet Signed-off-by: Olivier Lamy <olamy@apache.org>
sbordet
requested changes
Oct 15, 2023
jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java
Outdated
Show resolved
Hide resolved
| @@ -386,7 +386,7 @@ public MultiPartInputStreamParser(InputStream in, String contentType, MultipartC | |||
| * @param in Request input stream | |||
| * @param contentType Content-Type header | |||
| * @param config MultipartConfigElement | |||
| * @param contextTmpDir javax.servlet.context.tempdir | |||
| * @param contextTmpDir jakarta.servlet.context.tempdir | |||
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
Outdated
Show resolved
Hide resolved
|
|
||
| case LEGACY: | ||
| default: | ||
| return new MultiParts.MultiPartsUtilParser(getInputStream(), getContentType(), config, | ||
| (_context != null ? (File)_context.getAttribute("javax.servlet.context.tempdir") : null), this, maxParts); | ||
| (_context != null ? (File)_context.getAttribute("jakarta.servlet.context.tempdir") : null), this, maxParts); |
…ormInputStream.java Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Signed-off-by: Olivier Lamy <olamy@apache.org>
|
@sbordet good idea using the constant from |
gregw
approved these changes
Oct 16, 2023
sbordet
approved these changes
Oct 16, 2023
olamy
added a commit
that referenced
this pull request
Oct 17, 2023
…karta.servlet (#10735) * Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet Signed-off-by: Olivier Lamy <olamy@apache.org> * Update jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java Co-authored-by: Simone Bordet <simone.bordet@gmail.com> * Update jetty-server/src/main/java/org/eclipse/jetty/server/Request.java Co-authored-by: Simone Bordet <simone.bordet@gmail.com> * fix javadoc Signed-off-by: Olivier Lamy <olamy@apache.org> * more usage of constant Signed-off-by: Olivier Lamy <olamy@apache.org> --------- Signed-off-by: Olivier Lamy <olamy@apache.org> Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
olamy
added a commit
that referenced
this pull request
Oct 17, 2023
…t instead of jakarta.servlet (#10735) and Address build/test failure against bad entities. (#10742) (#10745) * Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet (#10735) * Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet Signed-off-by: Olivier Lamy <olamy@apache.org> * Update jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java Co-authored-by: Simone Bordet <simone.bordet@gmail.com> * Update jetty-server/src/main/java/org/eclipse/jetty/server/Request.java Co-authored-by: Simone Bordet <simone.bordet@gmail.com> * fix javadoc Signed-off-by: Olivier Lamy <olamy@apache.org> * more usage of constant Signed-off-by: Olivier Lamy <olamy@apache.org> --------- Signed-off-by: Olivier Lamy <olamy@apache.org> Co-authored-by: Simone Bordet <simone.bordet@gmail.com> * Address build/test failure against bad entities. (#10742) Bad entities in test case can lead to: * external URL references * required HTTP GET requests * not testing redirectEntity / resolveEntity (the whole point of the test) Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> * use constant Signed-off-by: Olivier Lamy <olamy@apache.org> --------- Signed-off-by: Olivier Lamy <olamy@apache.org> Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> Co-authored-by: Simone Bordet <simone.bordet@gmail.com> Co-authored-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: Olivier Lamy olamy@apache.org