diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-04-04 16:44:13 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-04 17:18:22 +0200 |
| commit | fbe1980e5ca85e516648420e0fed0d00b20a0529 (patch) | |
| tree | 76047c17f037a01d8447f8fd2e5e204d134a141a /lib/inets/src/http_client | |
| parent | eaf6a1477c4cd812eb31814cc09bdf14c796a9ba (diff) | |
| parent | c04e4cd533d9a4185eadda3141e0783b0f5a0fae (diff) | |
| download | otp-fbe1980e5ca85e516648420e0fed0d00b20a0529.tar.gz otp-fbe1980e5ca85e516648420e0fed0d00b20a0529.tar.bz2 otp-fbe1980e5ca85e516648420e0fed0d00b20a0529.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
erts/vsn.mk
lib/crypto/c_src/crypto.c
lib/crypto/src/crypto.erl
lib/ssh/src/ssh.erl
Diffstat (limited to 'lib/inets/src/http_client')
| -rw-r--r-- | lib/inets/src/http_client/httpc.erl | 10 | ||||
| -rw-r--r-- | lib/inets/src/http_client/httpc_response.erl | 3 |
2 files changed, 3 insertions, 10 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). diff --git a/lib/inets/src/http_client/httpc_response.erl b/lib/inets/src/http_client/httpc_response.erl index d24705a845..d81afde5fe 100644 --- a/lib/inets/src/http_client/httpc_response.erl +++ b/lib/inets/src/http_client/httpc_response.erl @@ -362,8 +362,9 @@ redirect(Response = {StatusLine, Headers, Body}, Request) -> {ok, error(Request, Reason), Data}; %% Automatic redirection {ok, {Scheme, _, Host, Port, Path, Query}} -> + HostPort = http_request:normalize_host(Scheme, Host, Port), NewHeaders = - (Request#request.headers)#http_request_h{host = Host++":"++integer_to_list(Port)}, + (Request#request.headers)#http_request_h{host = HostPort}, NewRequest = Request#request{redircount = Request#request.redircount+1, |