Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 11 to 12 Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet (#10735) and Address build/test failure against bad entities. (#10742) #10745

Merged
merged 3 commits into from
Oct 17, 2023

Conversation

olamy
Copy link
Member

@olamy olamy commented Oct 17, 2023

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 olamy added the Bug For general bugs on Jetty side label Oct 17, 2023
@olamy olamy changed the title Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet (#10735) Merge 11 to 12 Issue #10731 wrong context attribute name javax.servlet instead of jakarta.servlet (#10735) and Address build/test failure against bad entities. (#10742) Oct 17, 2023
Copy link
Contributor

@lachlan-roberts lachlan-roberts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are more places where the jakarta.servlet.context.tempdir attribute is used as a string in Jetty 12. But it looks like the ee9 -> ee8 conversion is working on them.

Still would be good to clean them up.

olamy and others added 3 commits October 17, 2023 14:05
…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>
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>
Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy
Copy link
Member Author

olamy commented Oct 17, 2023

@lachlan-roberts thanks I have cleaned them up (the comments doesn't matter much)

@olamy olamy merged commit f2ab447 into jetty-12.0.x Oct 17, 2023
2 checks passed
@olamy olamy deleted the jetty-12.0.x-merge-11 branch October 17, 2023 05:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug For general bugs on Jetty side
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants