diff options
author | Erlang/OTP <[email protected]> | 2017-03-31 12:58:34 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2017-03-31 12:58:34 +0200 |
commit | cb1b5ecaf0fb8740e114b127efd0b86f279e9f7f (patch) | |
tree | 8e11b23e22f8ee2699d1673015e94d34372a8774 /lib/inets/src/http_client/httpc.erl | |
parent | 42d3750f90f729b0aaa6e77a6e621e3d3798b76a (diff) | |
parent | a13e73d70d2af0a686701a3c8b16b82b664abd19 (diff) | |
download | otp-cb1b5ecaf0fb8740e114b127efd0b86f279e9f7f.tar.gz otp-cb1b5ecaf0fb8740e114b127efd0b86f279e9f7f.tar.bz2 otp-cb1b5ecaf0fb8740e114b127efd0b86f279e9f7f.zip |
Merge branch 'voltone/inets/httpc_redirect_normalize_host/PR-1381/OTP-14301' into maint-19
* voltone/inets/httpc_redirect_normalize_host/PR-1381/OTP-14301:
Omit port from Host header on redirect to well-known port
Diffstat (limited to 'lib/inets/src/http_client/httpc.erl')
-rw-r--r-- | lib/inets/src/http_client/httpc.erl | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl index bd5f6df39e..418b6247b0 100644 --- a/lib/inets/src/http_client/httpc.erl +++ b/lib/inets/src/http_client/httpc.erl @@ -524,7 +524,7 @@ handle_request(Method, Url, Options = request_options(Options0), Sync = proplists:get_value(sync, Options), Stream = proplists:get_value(stream, Options), - Host2 = header_host(Scheme, Host, Port), + Host2 = http_request:normalize_host(Scheme, Host, Port), HeadersRecord = header_record(NewHeaders, Host2, HTTPOptions), Receiver = proplists:get_value(receiver, Options), SocketOpts = proplists:get_value(socket_opts, Options), @@ -1035,14 +1035,6 @@ bad_option(Option, BadValue) -> throw({error, {bad_option, Option, BadValue}}). -header_host(https, Host, 443 = _Port) -> - Host; -header_host(http, Host, 80 = _Port) -> - Host; -header_host(_Scheme, Host, Port) -> - Host ++ ":" ++ integer_to_list(Port). - - header_record(NewHeaders, Host, #http_options{version = Version}) -> header_record(NewHeaders, #http_request_h{}, Host, Version). |