Merge branch 'bmk/inets/httpd/configurable_server_tokens/OTP-9805' into bmk/inets/inets59_integration

1 files changed, 67 insertions, 6 deletions

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index cfc58b8ddb..2c96c43efb 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,6 +33,67 @@
   </header>
   
 
+  <section><title>Inets 5.9</title>
+
+    <section><title>Improvements and New Features</title>
+<!--
+    <p>-</p>
+-->
+
+      <list>
+        <item>
+          <p>[httpd] Make the server header configurable with new config
+	  option 
+	  <seealso marker="httpd#prop_server_tokens">server_tokens</seealso>.
+	  The value of the server header, which was previously hard-coded 
+	  (at compile time), is now possible to manipulate through the means 
+	  of the 
+	  <seealso marker="httpd#prop_server_tokens">server_tokens</seealso> 
+	  config option. </p>
+	  <p>Own Id: OTP-9805</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+    <p>-</p>
+
+<!--
+      <list>
+        <item>
+          <p>[httpd] Fix logging of content length in mod_log. </p>
+	  <p>Garrett Smith</p>
+	  <p>Own Id: OTP-9715</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list>
+        <item>
+          <p>[httpc|httpd] The old ssl implementation (based on OpenSSL), 
+	  has been deprecated. The config option that specified usage of 
+	  this version of the ssl app, <c>ossl</c>, has been removed. </p>
+	  <p>Own Id: OTP-9522</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+  </section> <!-- 5.9 -->
+
+  
   <section><title>Inets 5.8.1</title>
     <section><title>Improvements and New Features</title>
     <p>-</p>
@@ -417,7 +478,7 @@
 	  <p><c>ossl</c> will work for as long as the ssl application 
 	  supports it. </p>
 	  <p>See the httpd 
-	  <seealso marker="httpd#comm_prop">socket_type</seealso> 
+	  <seealso marker="httpd#props_comm">socket_type</seealso> 
 	  communication property or the httpc 
 	  <seealso marker="httpc#request2">request/4,5</seealso> function
 	  for more info. </p>
@@ -436,7 +497,7 @@
       <list>
         <item>
           <p>[httpd] Wrong 
-	  <seealso marker="httpd#sec_prop">security property</seealso> 
+	  <seealso marker="httpd#props_sec">security property</seealso> 
 	  names used in documentation. </p>
 	  <p><c>security_data_file</c> used instead of <c>data_file</c>. </p>
 	  <p><c>security_max_retries</c> used instead of <c>max_retries</c>. </p>
@@ -620,7 +681,7 @@
             the <c>essl</c> tag instead. </p> 
           <p>See the <c>http_option</c> option in the 
             <seealso marker="httpc#request2">request/4,5</seealso> or 
-            the <seealso marker="httpd#comm_prop">socket-type</seealso>
+            the <seealso marker="httpd#props_comm">socket-type</seealso>
             section of the Communication properties chapter for more info, </p>
 	  <p>Own Id: OTP-7907</p>
         </item>
@@ -637,9 +698,9 @@
 	  <p>[httpd] - Improved mod_alias. 
             Now able to do better URL rewrites. </p> 
           <p>See 
-            <seealso marker="httpd#alias_prop">URL aliasing properties</seealso> 
+            <seealso marker="httpd#props_alias">URL aliasing properties</seealso> 
             and the 
-            <seealso marker="httpd#cgi_prop">CGI properties</seealso>
+            <seealso marker="httpd#props_cgi">CGI properties</seealso>
             section(s) for more info, </p>
 	  <p>Own Id: OTP-8573</p>
         </item>
@@ -1225,7 +1286,7 @@
             <p>Default is <c>inet6fb4</c> which emulates the 
               behaviour of the previous version. </p>
             <p>See the 
-	      <seealso marker="httpd#comm_prop">Communication properties</seealso> 
+	      <seealso marker="httpd#props_comm">Communication properties</seealso> 
               section for more info. </p>
 	    <p>Own Id: OTP-8069</p>
 	    <p>Aux Id: seq11086</p>