From 4b87b22ce97abf2759eb551222a862e17c5f4dcb Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 28 Apr 2010 15:36:55 +0000
Subject: OTP-8542: HTTP client memory leak OTP-8607: https default port not
 handled

---
 lib/inets/doc/src/notes.xml             | 7 +++++++
 lib/inets/src/http_client/httpc.erl     | 8 +++++---
 lib/inets/src/inets_app/inets.appup.src | 4 ++++
 lib/inets/vsn.mk                        | 2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'lib')

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 \
-- 
cgit v1.2.3