diff options
| author | Erlang/OTP <[email protected]> | 2016-04-01 20:18:49 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-04-01 20:18:49 +0200 |
| commit | 488f8b45695cacb3b3e1162ac132596f04d0e00d (patch) | |
| tree | c39125145da68bb80e325c92fd66ae09abbb2b25 | |
| parent | 523e048754f5086a6cc4fd9a250e1b495fc5b9b8 (diff) | |
| parent | b9c0ace0ca8a7ef8f6abe3acaf479716f9ea0f62 (diff) | |
| download | otp-488f8b45695cacb3b3e1162ac132596f04d0e00d.tar.gz otp-488f8b45695cacb3b3e1162ac132596f04d0e00d.tar.bz2 otp-488f8b45695cacb3b3e1162ac132596f04d0e00d.zip | |
Merge branch 'ia/inets/bracket-option/OTP-13417' into maint-18
* ia/inets/bracket-option/OTP-13417:
inets: Prepare for release
inets: Mend ipv6_host_with_brackets option
| -rw-r--r-- | lib/inets/src/http_client/httpc.erl | 6 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 2 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl index 85663b5ded..4554881d79 100644 --- a/lib/inets/src/http_client/httpc.erl +++ b/lib/inets/src/http_client/httpc.erl @@ -556,7 +556,7 @@ handle_request(Method, Url, Request = #request{from = Receiver, scheme = Scheme, - address = {Host, Port}, + address = {host_address(Host, BracketedHost), Port}, path = MaybeEscPath, pquery = MaybeEscQuery, method = Method, @@ -1268,3 +1268,7 @@ child_name(Pid, [_ | Children]) -> %% d(_, _, _) -> %% ok. +host_address(Host, false) -> + Host; +host_address(Host, true) -> + string:strip(string:strip(Host, right, $]), left, $[). diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index a9fbb1c3f7..6baecfe7a4 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,10 +18,12 @@ %% %CopyrightEnd% {"%VSN%", [ + {<<"6.2">>, [{load_module, httpc, soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ + {<<"6.2">>, [{load_module, httpc, soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 3d25b328af..df2359e012 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 6.2 +INETS_VSN = 6.2.1 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |