diff options
| author | Bruce Yinhe <[email protected]> | 2014-08-27 11:04:36 +0200 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2014-08-27 11:04:36 +0200 |
| commit | 2fbce26b3fe4bd7b4401f0e1313b778c38be36b2 (patch) | |
| tree | fede5d89efdde93fff2a54d47dacdc96c050bc5c /lib | |
| parent | e9ad19700b77ab91604de55516c2f110079635cb (diff) | |
| parent | 4a0f4a124d2a7be85e4bf77c58e31344f11f40bd (diff) | |
| download | otp-2fbce26b3fe4bd7b4401f0e1313b778c38be36b2.tar.gz otp-2fbce26b3fe4bd7b4401f0e1313b778c38be36b2.tar.bz2 otp-2fbce26b3fe4bd7b4401f0e1313b778c38be36b2.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/doc/src/httpc.xml | 2 | ||||
| -rw-r--r-- | lib/inets/src/http_client/httpc_handler.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml index 37eb7ba718..06cb035370 100644 --- a/lib/inets/doc/src/httpc.xml +++ b/lib/inets/doc/src/httpc.xml @@ -332,7 +332,7 @@ filename() = string() <p>Defaults to <c>true</c>. </p> </item> - <tag><c><![CDATA[header_as_is]]></c></tag> + <tag><c><![CDATA[headers_as_is]]></c></tag> <item> <p>Shall the headers provided by the user be made lower case or be regarded as case sensitive. </p> diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl index 5ae6760f08..d152d9f0be 100644 --- a/lib/inets/src/http_client/httpc_handler.erl +++ b/lib/inets/src/http_client/httpc_handler.erl @@ -1793,7 +1793,7 @@ tls_tunnel_request(#request{headers = Headers, host_header(#http_request_h{host = Host}, _) -> Host; -%% Handles header_as_is +%% Handles headers_as_is host_header(_, URI) -> {ok, {_, _, Host, _, _, _}} = http_uri:parse(URI), Host. |