Move the host request parsing to a separate method.#85
Merged
ioquatix merged 2 commits intoruby:masterfrom Jan 26, 2023
Merged
Conversation
Allows for someone to override the parsing to accommodate "alternatives".
One could write the following to allow underscores in host names.
require 'webrick/httprequest'
module WEBrick
class HTTPRequest
private
def parse_host_request_line(host, scheme)
uri = URI.parse("#{scheme}://#{host}")
[uri.host, uri.port]
end
end
end
Also adding the "o" option to the regex so the regex is only built once.
jeremyevans
reviewed
Jan 16, 2022
Contributor
jeremyevans
left a comment
jeremyevans
left a comment
There was a problem hiding this comment.
Looks good to me, other than one line being moved (maybe there is a reason for that?).
lib/webrick/httprequest.rb
Outdated
| str.sub!(%r{\A/+}o, '/') | ||
| uri = URI::parse(str) | ||
| return uri if uri.absolute? | ||
| uri.scheme = @forwarded_proto || scheme |
Contributor
There was a problem hiding this comment.
Is there a reason this line was moved?
Contributor
Author
There was a problem hiding this comment.
Need the scheme to use URI.parse in my universe.
Contributor
Author
There was a problem hiding this comment.
Ignore that - not needed - will fix
jeremyevans
approved these changes
Jan 16, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Allows for someone to override the parsing to accommodate "alternatives".
One could write the following to allow underscores in host names.
Also adding the "o" option to the regex so the regex is only built once.``