inets: Patch 1129

    OTP-8739  [httpc] If a request times out (not connect timeout), the
              handler process exited (normal) but neglected to inform
              the manager process. For this reason, the manager did not
              clean up the request table, resulting in a memory leak.
              Also the manager did not create a monitor for the handler,
              so in an unforseen handler crash, this could also create
              a memory leak.

    OTP-8741  The service tftp was spelled wrong in documentation and
              in some parts of the code. It should be tftp.

    OTP-8742  [httpc] Replaced the old http client api module (http) with
              the new, httpc in the users guide.

3 files changed, 85 insertions, 29 deletions

diff --git a/lib/inets/doc/src/http_client.xml b/lib/inets/doc/src/http_client.xml
index 510c30eb35..ea8053cafa 100644
--- a/lib/inets/doc/src/http_client.xml
+++ b/lib/inets/doc/src/http_client.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -56,8 +56,8 @@
     <pre>
       [{inets, [{services, [{httpc, PropertyList}]}]}]
     </pre>
-    <p>For valid properties see <seealso
-			       marker="http">http(3)</seealso></p>
+    <p>For valid properties see 
+    <seealso marker="http">httpc(3)</seealso>. </p>
   </section>
 
   <section>
@@ -71,67 +71,66 @@
       but not for requests to localhost. This will apply to all subsequent
       requests</p>
     <code type="erl">
-      2 > http:set_options([{proxy, {{"www-proxy.mycompany.com", 8000},
+      2 > httpc:set_options([{proxy, {{"www-proxy.mycompany.com", 8000},
       ["localhost"]}}]).
       ok
     </code>
     <p>An ordinary synchronous request. </p>
     <code type="erl">
       3 > {ok, {{Version, 200, ReasonPhrase}, Headers, Body}} =
-      http:request(get, {"http://www.erlang.org", []}, [], []).
+      httpc:request(get, {"http://www.erlang.org", []}, [], []).
     </code>
     <p>With all default values, as above, a get request can also be written
       like this.</p>
     <code type="erl">
       4 > {ok, {{Version, 200, ReasonPhrase}, Headers, Body}} =
-      http:request("http://www.erlang.org").
+      httpc:request("http://www.erlang.org").
     </code>
     <p>An ordinary asynchronous request. The result will be sent
       to the calling process on the form {http, {ReqestId, Result}}</p>
     <code type="erl">
       5 > {ok, RequestId} =
-      http:request(get, {"http://www.erlang.org", []}, [], [{sync, false}]).
+      httpc:request(get, {"http://www.erlang.org", []}, [], [{sync, false}]).
     </code>
     <p>In this case the calling process is the shell, so we receive the
       result.</p>
     <code type="erl">
-      6 >  receive {http, {RequestId, Result}} -> ok after 500 -> error end.
+      6 > receive {http, {RequestId, Result}} -> ok after 500 -> error end.
       ok
     </code>
     <p>Send a request with a specified connection header. </p>
     <code type="erl">
       7 > {ok, {{NewVersion, 200, NewReasonPhrase}, NewHeaders, NewBody}} =
-      http:request(get, {"http://www.erlang.org", [{"connection", "close"}]},
+      httpc:request(get, {"http://www.erlang.org", [{"connection", "close"}]},
       [], []).
     </code>
 
     <p>Start a HTTP client profile. </p>
    
     <code><![CDATA[
-      8 >  {ok, Pid} = inets:start(httpc, [{profile, foo}]).
+      8 > {ok, Pid} = inets:start(httpc, [{profile, foo}]).
       {ok, <0.45.0>}       
       ]]></code>
     
     <p>The new profile has no proxy settings so the connection will
       be refused</p>
       <code type="erl">
-      9 > http:request("http://www.erlang.org", foo).              
-      {error,econnrefused}
+      9 > httpc:request("http://www.erlang.org", foo). 
+      {error, econnrefused}
     </code>
 
     <p>Stop a HTTP client profile. </p>
     <code type="erl">
-      10 >  inets:stop(httpc, foo).
+      10 > inets:stop(httpc, foo).
       ok
     </code>
     
     <p>Alternatively:</p>
     <code type="erl">
-      10 >  inets:stop(httpc, Pid).
+      10 > inets:stop(httpc, Pid).
       ok
     </code>
     
-    
   </section>
 </chapter>
 
diff --git a/lib/inets/doc/src/inets.xml b/lib/inets/doc/src/inets.xml
index 81dfe7e944..c367d7fa77 100644
--- a/lib/inets/doc/src/inets.xml
+++ b/lib/inets/doc/src/inets.xml
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-
+    
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-
+    
     </legalnotice>
 
     <title>inets</title>
@@ -40,13 +40,13 @@
     <title>COMMON DATA TYPES </title>
     <p>Type definitions that are used more than once in
       this module: </p>
-    <p><c> service() = ftpc | tfptd | httpc | httpd</c></p>
+    <p><c> service() = ftpc | tftp | httpc | httpd</c></p>
     <p><c> property() = atom() </c></p>
   </section>
   <funcs>
     <func>
       <name>services() -> [{Service, Pid}]</name>
-      <fsummary>Returns a list of currently running services.  </fsummary>
+      <fsummary>Returns a list of currently running services. </fsummary>
       <type>
         <v>Service = service()</v>
         <v>Pid = pid()</v>
@@ -97,7 +97,7 @@
       <name>start(Type) -> ok | {error, Reason}</name>
       <fsummary>Starts the Inets application. </fsummary>
       <type>
-        <v>Type =  permanent | transient | temporary</v>
+        <v>Type = permanent | transient | temporary</v>
       </type>
       <desc>
         <p>Starts the Inets application. Default type
@@ -115,11 +115,9 @@
     </func>
     <func>
       <name>start(Service, ServiceConfig) -> {ok, Pid} | {error, Reason}</name>
-      <name>start(Service, ServiceConfig, How) -> {ok, Pid} |
-	{error, Reason}</name>
+      <name>start(Service, ServiceConfig, How) -> {ok, Pid} | {error, Reason}</name>
       <fsummary>Dynamically starts an inets
-	service after the inets application has been
-	started. </fsummary>
+      service after the inets application has been started. </fsummary>
       <type>
         <v>Service = service()</v>
         <v>ServiceConfig = [{Option, Value}]</v>
@@ -153,9 +151,9 @@
       <fsummary>Stops a started service of the inets application or takes
           down a "stand_alone-service" gracefully.</fsummary>
       <type>
-        <v>Service = service() | stand_alone</v>
+	<v>Service = service() | stand_alone</v>
 	<v>Reference = pid() | term() - service specified reference</v>
-        <v>Reason = term()</v>	
+	<v>Reason = term()</v>
       </type>
       <desc>
         <p>Stops a started service of the inets application or takes
@@ -169,7 +167,7 @@
   <section>
     <title>SEE ALSO</title>
     <p><seealso marker="ftp">ftp(3)</seealso>,
-      <seealso marker="http">http(3)</seealso>,
+      <seealso marker="httpc">httpc(3)</seealso>,
       <seealso marker="httpd">httpd(3)</seealso>,
       <seealso marker="tftp">tftp(3)</seealso></p>
   </section>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index fed42291ab..9ab35ff38b 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-
+    
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-
+    
     </legalnotice>
     
     <title>Inets Release Notes</title>
@@ -32,6 +32,65 @@
     <file>notes.xml</file>
   </header>
   
+  <section><title>Inets 5.3.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <p>-</p>
+
+<!--
+      <list>
+        <item>
+	  <p>[httpc] - Allow users to pass socket options to the transport 
+            module when making requests. </p> 
+          <p>See the <c>socket_opts</c> option in the 
+            <seealso marker="httpc#request2">request/4</seealso> or 
+            <seealso marker="httpc#set_options">set_options/1,2</seealso>
+            for more info, </p>
+	  <p>Own Id: OTP-8352</p>
+        </item>
+
+      </list>
+-->
+    </section>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+
+<!--
+      <p>-</p>
+-->
+
+      <list>
+        <item>
+	  <p>[httpc] - If a request times out (not during connect), the 
+	  handler process exited (normal) but neglected to inform
+	  the manager process. For this reason, the manager 
+	  did not clean up the request table, resulting in a 
+	  memory leak. Also the manager did not create a monitor
+	  for the handler, so in an unforseen handler crash, this
+	  could also create a memory leak. </p>
+	  <p>Own Id: OTP-8739</p>
+        </item>
+
+        <item>
+	  <p>[tftp] - Was spelled wrong in documentation and in some 
+	  parts of the code. It should be tftp. </p>
+	  <p>Own Id: OTP-8741</p>
+        </item>
+
+        <item>
+	  <p>[htpc] - Replaced the old http client api module (http) 
+	  with the new, http client in the 
+	  <seealso marker="http_client">Users Guide</seealso>. </p>
+	  <p>Own Id: OTP-8742</p>
+	  <p>Ryan Zezeski</p>
+        </item>
+
+      </list>
+    </section>
+
+  </section> <!-- 5.3.4 -->
+
+
   <section><title>Inets 5.3.3</title>
 
     <section><title>Improvements and New Features</title>