From 52b0134e8f7b871051af9be6cb7354553a0f72cd Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 10 Mar 2011 11:20:16 +0100
Subject: Added proper release notes, appup and version.

---
 lib/inets/doc/src/mod_esi.xml           | 29 +++++++++++++-----------
 lib/inets/doc/src/notes.xml             | 39 +++++++++++++++++++++++++++++++++
 lib/inets/src/inets_app/inets.appup.src | 12 +++++++++-
 lib/inets/vsn.mk                        |  2 +-
 4 files changed, 67 insertions(+), 15 deletions(-)

(limited to 'lib/inets')

diff --git a/lib/inets/doc/src/mod_esi.xml b/lib/inets/doc/src/mod_esi.xml
index e063088eb4..7b1e93e313 100644
--- a/lib/inets/doc/src/mod_esi.xml
+++ b/lib/inets/doc/src/mod_esi.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,9 +32,12 @@
   <modulesummary>Erlang Server Interface </modulesummary>
   <description>
     <p>This module defines the API - Erlang Server Interface (ESI).
-      Which is a more efficient way of writing erlang scripts
-      for your Inets web server than writing them as common CGI scripts.</p>
+    Which is a more efficient way of writing erlang scripts
+    for your Inets web server than writing them as common CGI scripts.</p>
+
+    <marker id="deliver"></marker>
   </description>
+
   <funcs>
     <func>
       <name>deliver(SessionID, Data) -> ok | {error, Reason}</name>
@@ -51,15 +54,15 @@
 	parts of the content to the user.</p>
 	<p>Sends data from a Erl Scheme script back to the client.</p>
 	
-	<note><p>Note
-          that if any HTTP-header fields should be added by the
-          script they must be in the first call to deliver/2  and the
-			 data in the call must be a string. Calls after the headers
-			 are complete may contain binary data to reduce copying
-			 overhead.  Do not
-          assume anything about the data type of SessionID, the
-          SessionID must be the value given as input to the esi
-          call back function that you implemented.</p></note>
+	<note>
+	  <p>Note that if any HTTP-header fields should be added by the
+	  script they must be in the first call to deliver/2  and the
+	  data in the call must be a string. Calls after the headers
+	  are complete may contain binary data to reduce copying
+	  overhead.  Do not assume anything about the data type of 
+	  SessionID, the SessionID must be the value given as input to 
+	  the esi call back function that you implemented.</p>
+	</note>
       </desc>
     </func>
   </funcs>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 5da9d98002..8e1acba9b8 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,6 +32,45 @@
     <file>notes.xml</file>
   </header>
   
+  <section><title>Inets 5.6</title>
+
+    <section><title>Improvements and New Features</title>
+<!--
+    <p>-</p>
+-->
+
+      <list>
+        <item>
+          <p>[httpd] 
+	  <seealso marker="mod_esi#deliver">mod_esi:deliver/2</seealso> 
+	  made to accept binary data. </p>
+          <p>Own Id: OTP-9123</p>
+        </item>
+      </list>
+
+    </section>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+    <p>-</p>
+<!--
+    <list>
+      <item>
+	<p>[httpd] httpd_response:send_chunk handles empty list and 
+	empty binary - i.e. no chunk is sent, but it does 
+	not handle a list with an empty binary [&lt;&lt;&gt;&gt;]. 
+	This will be sent as an empty chunk - which in turn 
+	will be encoded by http_chunk to the same as a final 
+	chunk, which will make the http client believe that 
+	the end of the page is reached.</p>
+	<p>Own Id: OTP-8906</p>
+      </item>
+    </list>
+-->
+    </section>
+
+  </section> <!-- 5.6 -->
+
+
   <section><title>Inets 5.5.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 07da8ca961..b75277706f 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.5.2", 
+   [
+    {load_module, mod_esi, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"5.5.1", 
    [
     {load_module, http_chunk, soft_purge, soft_purge, []}
@@ -34,7 +39,12 @@
    ]
   } 
  ],
- [	
+ [
+  {"5.5.2", 
+   [
+    {load_module, mod_esi, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"5.5.1", 
    [
     {load_module, http_chunk, soft_purge, soft_purge, []}
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index b1de3fef43..c0e25a30e3 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 5.5.2
+INETS_VSN   = 5.6
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
 
-- 
cgit v1.2.3