diff options
| author | Micael Karlberg <[email protected]> | 2010-04-28 15:36:55 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-28 15:36:55 +0000 |
| commit | 4b87b22ce97abf2759eb551222a862e17c5f4dcb (patch) | |
| tree | a7f1bace0e899f471f0b43e946cb4a2e10495918 /lib | |
| parent | 98226b13ccabb8e968b33a649aa175a7c48b0d3b (diff) | |
| download | otp-4b87b22ce97abf2759eb551222a862e17c5f4dcb.tar.gz otp-4b87b22ce97abf2759eb551222a862e17c5f4dcb.tar.bz2 otp-4b87b22ce97abf2759eb551222a862e17c5f4dcb.zip | |
OTP-8542: HTTP client memory leak
OTP-8607: https default port not handled
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 7 | ||||
| -rw-r--r-- | lib/inets/src/http_client/httpc.erl | 8 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 4 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
4 files changed, 17 insertions, 4 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 09a81122c2..3216b0c2cd 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -71,6 +71,13 @@ <p>Lev Walkin</p> </item> + <item> + <p>[httpc] - https requests with default port (443) not handled + properly. </p> + <p>Own Id: OTP-8607</p> + <p>jebu ittiachen</p> + </item> + </list> </section> diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl index 5205605e0a..6deeab6948 100644 --- a/lib/inets/src/http_client/httpc.erl +++ b/lib/inets/src/http_client/httpc.erl @@ -432,7 +432,7 @@ handle_request(Method, Url, Options = request_options(Options0), Sync = proplists:get_value(sync, Options), Stream = proplists:get_value(stream, Options), - Host2 = header_host(Host, Port), + Host2 = header_host(Scheme, Host, Port), HeadersRecord = header_record(NewHeaders, Host2, HTTPOptions), Receiver = proplists:get_value(receiver, Options), SocketOpts = proplists:get_value(socket_opts, Options), @@ -895,9 +895,11 @@ bad_option(Option, BadValue) -> throw({error, {bad_option, Option, BadValue}}). -header_host(Host, 80 = _Port) -> +header_host(https, Host, 443 = _Port) -> Host; -header_host(Host, Port) -> +header_host(http, Host, 80 = _Port) -> + Host; +header_host(_Scheme, Host, Port) -> Host ++ ":" ++ integer_to_list(Port). diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 7e2306d0c6..dfdfb41373 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -20,12 +20,14 @@ [ {"5.3.1", [ + {load_module, httpc, soft_purge, soft_purge, []}, {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]}, {update, httpc_manager, soft, soft_purge, soft_purge, []} ] }, {"5.3", [ + {load_module, httpc, soft_purge, soft_purge, []}, {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]}, {update, httpc_manager, soft, soft_purge, soft_purge, []}, {load_module, mod_esi, soft_purge, soft_purge, []} @@ -50,12 +52,14 @@ [ {"5.3.1", [ + {load_module, httpc, soft_purge, soft_purge, []}, {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]}, {update, httpc_manager, soft, soft_purge, soft_purge, []} ] }, {"5.3", [ + {load_module, httpc, soft_purge, soft_purge, []}, {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]}, {update, httpc_manager, soft, soft_purge, soft_purge, []}, {load_module, mod_esi, soft_purge, soft_purge, []} diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index ba808a2415..7776bef0a5 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -22,7 +22,7 @@ INETS_VSN = 5.3.2 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" -TICKETS = OTP-8542 +TICKETS = OTP-8542 OTP-8607 TICKETS_5_3_1 = \ OTP-8508 \ |