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.

Sign up for GitHub

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

Jump to bottom

Fix #11414 URI schema and port normalization #11416

Merged
merged 13 commits into from
Feb 20, 2024
Merged

Fix #11414 URI schema and port normalization #11416

merged 13 commits into from
Feb 20, 2024

Conversation

gregw
Copy link
Contributor

@gregw gregw commented Feb 16, 2024

This PR builds on and replaces #11415.

It retains the HttpURI changes, but reverts to using URIUtil methods for URI manipulations that need strings.
The knowledge of default ports has been moved from HttpScheme to URIUtil and expanded for more schemes.

@gregw gregw requested a review from joakime February 16, 2024 15:31
joakime
joakime reviewed Feb 16, 2024
View reviewed changes
Copy link
Contributor

@joakime joakime left a comment

Choose a reason for hiding this comment

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

Looks better. I need to fix some test case assertions elsewhere that are expecting Location lines with things like http://local:8080/path (which isn't sane anymore).

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java Outdated Show resolved Hide resolved
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java Outdated Show resolved Hide resolved
jetty-core/jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java Outdated Show resolved Hide resolved
jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java Show resolved Hide resolved
@gregw gregw marked this pull request as ready for review February 17, 2024 07:34
@joakime joakime mentioned this pull request Feb 17, 2024
Closed
@gregw gregw requested review from joakime and sbordet February 17, 2024 17:58
@gregw gregw merged commit f07d812 into jetty-12.0.x Feb 20, 2024
8 checks passed
@gregw gregw deleted the fix/12.0.x/11414-httpuris-spec-scheme-port2 branch February 20, 2024 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joakime joakime joakime approved these changes

@sbordet sbordet Awaiting requested review from sbordet

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gregw @joakime