inets: Patch 1111

    OTP-8508  [httpc] Badly formated error reason for errors occuring
	      during initial connec to a servert. Also, the possible error
	      reasons was not properly documented.

    OTP-8509  [httpd] Issues with ESI erl_script_timeout. </p> *) The
	      "erl_script_timeout" config option is ducumented as a number
	      of seconds. But when parsing the config, in the new format
	      (not a config file), it was handled as if in number of
	      milliseconds. *) When the erl-script-timeout time was
	      exceeded, the server incorrectly marked the answer as sent,
	      thereby leaving client hanging (with an incomplete answer).
	      This has been changed, so that now the socket will be closed.

5 files changed, 79 insertions, 11 deletions

diff --git a/lib/inets/doc/src/http_server.xml b/lib/inets/doc/src/http_server.xml
index 547617e2e3..01e0b47d37 100644
--- a/lib/inets/doc/src/http_server.xml
+++ b/lib/inets/doc/src/http_server.xml
@@ -357,7 +357,7 @@ UserName:Password
         <p>The mod_cgi module makes it possible to execute CGI scripts
           in the server.  A file that matches the definition of a
           ScriptAlias config directive is treated as a CGI script.  A CGI
-          script is executed by the server and it's output is returned to
+          script is executed by the server and its output is returned to
           the client. </p>
         <p>The CGI Script response comprises a message-header and a
           message-body, separated by a blank line.  The message-header
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index ca93190f61..7430a62b1b 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -191,7 +191,8 @@ ssl_options() = {verify,     code()}   |
         <v>Result = {status_line(), headers(), body()} | 
                     {status_code(), body()} | request_id() </v>
         <v>Profile = profile() </v>
-        <v>Reason = term() </v>
+        <v>Reason = {connect_failed, term()} | 
+                    {send_failed, term()} | term() </v>
       </type>
 
       <desc>
diff --git a/lib/inets/doc/src/httpd_util.xml b/lib/inets/doc/src/httpd_util.xml
index 642e5213b0..6ac2b13c72 100644
--- a/lib/inets/doc/src/httpd_util.xml
+++ b/lib/inets/doc/src/httpd_util.xml
@@ -63,7 +63,7 @@
         <v>Etag = string()</v>
       </type>
       <desc>
-        <p><c>create_etag/1</c> calculates the Etag for a file, from it's 
+        <p><c>create_etag/1</c> calculates the Etag for a file, from its
           size and time for last modification. fileinfo is a record defined 
           in <c>kernel/include/file.hrl</c></p>
 
@@ -78,7 +78,7 @@
         <v>HexValue = DecValue = string()</v>
       </type>
       <desc>
-        <p>Converts the hexadecimal value <c>HexValue</c> into it's
+        <p>Converts the hexadecimal value <c>HexValue</c> into its
           decimal equivalent (<c>DecValue</c>).</p>
 
 	<marker id="day"></marker>
diff --git a/lib/inets/doc/src/mod_security.xml b/lib/inets/doc/src/mod_security.xml
index 5f9f88071e..2a871d29d8 100644
--- a/lib/inets/doc/src/mod_security.xml
+++ b/lib/inets/doc/src/mod_security.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -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>mod_security</title>
@@ -117,11 +117,14 @@
   <section>
     <marker id="callback_module"></marker>
     <title>The SecurityCallbackModule</title>
-    <p>The SecurityCallbackModule is a user written module that can receive events from
-      the mod_security Erlang Webserver API module. This module only exports one function,
-      <seealso marker="#callback_module_event">event/4</seealso>, which is described below.
+    <p>The SecurityCallbackModule is a user written module that can receive 
+      events from the mod_security Erlang Webserver API module. 
+      This module only exports the function(s),
+      <seealso marker="#callback_module_event">event/4,5</seealso>, 
+      which are described below.
       </p>
   </section>
+
   <funcs>
     <func>
       <name>event(What, Port, Dir, Data) -> ignored</name>
@@ -131,7 +134,7 @@
         <v>What  = atom()</v>
         <v>Port  = integer()</v>
         <v>Address = {A,B,C,D} | string() &lt;v>Dir   = string()</v>
-        <v>What  = [Info]</v>
+        <v>Data  = [Info]</v>
         <v>Info  = {Name, Value}</v>
       </type>
       <desc>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 0c524f00d1..762c2c84c5 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,6 +32,70 @@
     <file>notes.xml</file>
   </header>
   
+  <section><title>Inets 5.3.1</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] - Badly formated error reason for errors occuring 
+            during initial connect to a server. 
+            Also, the possible error reasons was 
+            not properly documented.</p>
+	  <p>Own Id: OTP-8508</p>
+	  <p>Aux Id: seq11407</p>
+        </item>
+
+        <item>
+	  <p>[httpd] - Issues with ESI erl_script_timeout. </p>
+          <p>
+            <list type="bulleted">
+	      <item>
+		<p>The <c>erl_script_timeout</c> config option is ducumented
+                  as a number of seconds. But when parsing the config, in the
+                  new format (not a config file), it was handled as if in
+                  number of milliseconds. </p>
+              </item>
+	      <item>
+		<p>When the erl-script-timeout time was exceeded, the server
+                  incorrectly marked the answer as sent, thereby leaving 
+                  client hanging (with an incomplete answer).
+                  This has been changed, so that now the socket will be
+                  closed. </p>
+	      </item>
+	    </list>
+	  </p>
+	  <p>Own Id: OTP-8509</p>
+        </item>
+      </list>
+    </section>
+
+  </section> <!-- 5.3.1 -->
+
+
   <section><title>Inets 5.3</title>
 
     <section><title>Improvements and New Features</title>