From 6769f83da0f193052a30ff8933a014e9cf3b0cdf Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 31 May 2010 12:00:00 +0200
Subject: inets: Patch 1122

    OTP-8609  [httpc] Made cookie handling more case insensitive.

    OTP-8610  [httpc|httpd] Some netscape cookie dates are given with
              a 2-digit year (e.g. 06 = 2006).

    OTP-8624  [httpd] Added support (again) for the documented debugging
              features. See the User's Guide Configuration chapter for
              more info.
---
 lib/inets/doc/src/http_server.xml | 13 +++++++++
 lib/inets/doc/src/notes.xml       | 55 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

(limited to 'lib/inets/doc')

diff --git a/lib/inets/doc/src/http_server.xml b/lib/inets/doc/src/http_server.xml
index 01e0b47d37..68dfd1add0 100644
--- a/lib/inets/doc/src/http_server.xml
+++ b/lib/inets/doc/src/http_server.xml
@@ -30,6 +30,8 @@
     <date></date>
     <rev></rev>
     <file>http_server.xml</file>
+
+    <marker id="intro"></marker>
   </header>
 
   <section>
@@ -65,6 +67,8 @@
       Server API. This API can be used to advantage by all who wants
       to enhance the server core functionality, for example custom
       logging and authentication.</p>
+
+    <marker id="config"></marker>
   </section>
   
   <section>
@@ -109,6 +113,8 @@
       functions or only exported functions on chosen modules.</p>
     <p>{accept_timeout, integer()} sets the wanted timeout value for
       the server to set up a request connection.</p>
+
+    <marker id="using_http_server_api"></marker>
   </section>
 
   <section>
@@ -173,6 +179,7 @@
       the ip address reported by the info function and can
       not be the hostname that is allowed when inputting bind_address.</p>
     
+    <marker id="htaccess"></marker>
   </section>
 
   <section>
@@ -337,6 +344,8 @@ UserName:Password
           </item>
         </list>
       </section>
+
+      <marker id="dynamic_we_pages"></marker>
     </section>
   
     <section>
@@ -434,6 +443,8 @@ http://your.server.org/eval?httpd_example:print(atom_to_list(apply(erlang,halt,[
           </note>
         </section>
       </section>
+
+      <marker id="logging"></marker>
     </section>
 
   <section>
@@ -467,6 +478,8 @@ http://your.server.org/eval?httpd_example:print(atom_to_list(apply(erlang,halt,[
         </p>
       <p><em>[date]</em> access to <em>path</em> failed for
         <em>remotehost</em>, reason: <em>reason</em></p>
+
+    <marker id="ssi"></marker>
   </section>
 
   <section>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 3216b0c2cd..fed42291ab 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,6 +32,61 @@
     <file>notes.xml</file>
   </header>
   
+  <section><title>Inets 5.3.3</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] - Made cookie handling more case insensitive.</p>
+	  <p>Own Id: OTP-8609</p>
+          <p>Nicolas Thauvin</p>
+        </item>
+
+        <item>
+	  <p>[httpc|httpd] - Netscape cookie dates can also be given with a 
+            2-digit year (e.g. 06 = 2006). </p>
+	  <p>Own Id: OTP-8610</p>
+          <p>Nicolas Thauvin</p>
+        </item>
+
+        <item>
+	  <p>[httpd] - Added support (again) for the documented debugging 
+            features. See the User's Guide 
+            <seealso marker="http_server#config">Configuration</seealso> 
+            chapter for more info. </p>
+	  <p>Own Id: OTP-8624</p>
+        </item>
+
+      </list>
+    </section>
+
+  </section> <!-- 5.3.3 -->
+
+
   <section><title>Inets 5.3.2</title>
 
     <section><title>Improvements and New Features</title>
-- 
cgit v1.2.3