Fix #10306 getServerHost #10311
Merged
Fix #10306 getServerHost #10311
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
Fix #10306 getServerHost
work in progress
more javadoc
|
@sbordet nudge |
sbordet
requested changes
Aug 17, 2023
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ConnectionMetaData.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
Outdated
Show resolved
Hide resolved
sbordet
previously approved these changes
Aug 17, 2023
| @@ -419,23 +418,18 @@ static String getServerName(Request request) | |||
| if (uri.hasAuthority()) | |||
| return HostPort.normalizeHost(uri.getHost()); | |||
|
|
|||
| HostPort authority = request.getConnectionMetaData().getHttpConfiguration().getServerAuthority(); | |||
| HostPort authority = request.getConnectionMetaData().getServerAuthority(); | |||
| if (authority != null) | |||
| return HostPort.normalizeHost(authority.getHost()); | |||
There was a problem hiding this comment.
No need to normalize again, as HostPort normalizes in the constructor.
There was a problem hiding this comment.
@sbordet Fixed, but will need a re-review to get green tick back
sbordet
approved these changes
Aug 17, 2023
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.
Fix #10306 getServerHost
Use the default scheme before using the local port