Skip to content

Move the host request parsing to a separate method. #85

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

Merged
merged 2 commits into from
Jan 26, 2023
Merged

Move the host request parsing to a separate method. #85

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed12c2a
Move the host request parsing to a separate method.
wishdev Jan 15, 2022
21f4159
Scheme not needed so we'll replace things.
wishdev Jan 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/webrick/httprequest.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,22 +488,26 @@ def parse_uri(str, scheme="http")
str.sub!(%r{\A/+}o, '/')
uri = URI::parse(str)
return uri if uri.absolute?
uri.scheme = @forwarded_proto || scheme
Copy link
Contributor

@jeremyevans jeremyevans Jan 16, 2022

Choose a reason for hiding this comment

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

Is there a reason this line was moved?

Copy link
Contributor Author

@wishdev wishdev Jan 16, 2022

Choose a reason for hiding this comment

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

Need the scheme to use URI.parse in my universe.

Copy link
Contributor Author

@wishdev wishdev Jan 16, 2022

Choose a reason for hiding this comment

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

Ignore that - not needed - will fix

if @forwarded_host
host, port = @forwarded_host, @forwarded_port
elsif self["host"]
pattern = /\A(#{URI::REGEXP::PATTERN::HOST})(?::(\d+))?\z/n
host, port = *self['host'].scan(pattern)[0]
host, port = parse_host_request_line(self["host"], uri.scheme)
elsif @addr.size > 0
host, port = @addr[2], @addr[1]
else
host, port = @config[:ServerName], @config[:Port]
end
uri.scheme = @forwarded_proto || scheme
uri.host = host
uri.port = port ? port.to_i : nil
return URI::parse(uri.to_s)
end

def parse_host_request_line(host, _scheme)
pattern = /\A(#{URI::REGEXP::PATTERN::HOST})(?::(\d+))?\z/no
host.scan(pattern)[0]
end

def read_body(socket, block)
return unless socket
if tc = self['transfer-encoding']
Expand Down