From e4605d7a3b9f9be9e437689a79df0f568df8fdac Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 15 Jun 2011 17:14:54 +0200
Subject: [httpc] Remove unnecessary usage of iolist_to_binary when processing
 body (for PUT and POST). Filipe David Manana OTP-9317

---
 lib/inets/doc/src/notes.xml             | 40 +++++++++++++++++++++++++++++++++
 lib/inets/src/http_client/httpc.erl     | 14 +++++-------
 lib/inets/src/inets_app/inets.appup.src | 10 +++++++++
 lib/inets/vsn.mk                        |  2 +-
 4 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 0926df8581..c9972b6755 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,6 +32,46 @@
     <file>notes.xml</file>
   </header>
   
+  <section><title>Inets 5.7</title>
+
+    <section><title>Improvements and New Features</title>
+    <p>-</p>
+
+<!--
+      <list>
+        <item>
+          <p>[httpc] Add support for upload body streaming (PUT and POST).</p>
+	  <p>For more info, 
+	  see the definition of the <c>Body</c> argument of the 
+	  <seealso marker="httpc#request2">request/4,5</seealso> 
+	  function. </p>
+	  <p>Filipe David Manana</p>
+	  <p>Own Id: OTP-9094</p>
+        </item>
+
+      </list>
+-->
+    </section>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+<!--
+    <p>-</p>
+-->
+
+      <list>
+        <item>
+          <p>[httpc] Remove unnecessary usage of iolist_to_binary when 
+	  processing body (for PUT and POST). </p>
+	  <p>Filipe David Manana</p>
+	  <p>Own Id: OTP-9317</p>
+        </item>
+
+      </list>
+    </section>
+
+  </section> <!-- 5.7 -->
+
+
   <section><title>Inets 5.6</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index 6ffa5e8ba5..8aaa9ec402 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -518,17 +518,15 @@ mk_chunkify_fun(ProcessBody) ->
 		eof ->
 		    {ok, <<"0\r\n\r\n">>, eof_body};
 		{ok, Data, NewAcc} ->
-		    {ok, mk_chunk_bin(Data), NewAcc}
+		    Chunk = [
+			     integer_to_list(iolist_size(Data), 16), 
+			     "\r\n",
+			     Data,
+			     "\r\n"],
+		    {ok, Chunk, NewAcc}
 	    end
     end.
 
-mk_chunk_bin(Data) ->
-    Bin = iolist_to_binary(Data),
-    iolist_to_binary([hex_size(Bin), "\r\n", Bin, "\r\n"]).
-
-hex_size(Bin) ->
-    hd(io_lib:format("~.16B", [size(Bin)])).
-
 
 handle_answer(RequestId, false, _) ->
     {ok, RequestId};
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 47f3fbba58..260a0984f2 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,6 +18,11 @@
 
 {"%VSN%",
  [
+  {"5.6", 
+   [
+    {load_module, httpc, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"5.5.2", 
    [
     {restart_application, inets}
@@ -40,6 +45,11 @@
   } 
  ],
  [
+  {"5.6", 
+   [
+    {load_module, httpc, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"5.5.2",
    [
     {restart_application, inets}
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index c0e25a30e3..4abc1733d3 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 5.6
+INETS_VSN   = 5.7
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
 
-- 
cgit v1.2.3