From be97727709814ca6e872806f30933b267c6f700b Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 25 Oct 2011 12:48:03 +0200
Subject: Added release notes, appup and correct version. OTP-9655

---
 lib/inets/doc/src/notes.xml             | 14 +++++++++++
 lib/inets/src/inets_app/inets.appup.src | 44 +++++++++++----------------------
 lib/inets/vsn.mk                        |  6 +++--
 3 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'lib/inets')

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index ffbe4bd58f..28d51b4ebd 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,6 +32,20 @@
     <file>notes.xml</file>
   </header>
   
+  <section><title>Inets 5.3.6</title>
+  
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>[httpd] XSS prevention did not work for hex-encoded URL's. </p>
+          <p>Own Id: OTP-9655</p>
+        </item>
+      </list>
+    </section>
+  
+  </section> <!-- 5.3.6 -->
+
+
   <section><title>Inets 5.3.5</title>
   
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index c31b0deb30..ea696b9155 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,6 +18,13 @@
 
 {"%VSN%",
  [
+  {"5.3.5",
+   [
+    {load_module, http_util, soft_purge, soft_purge, []},
+    {load_module, httpd_util, soft_purge, soft_purge, [http_util]},
+    {load_module, httpd_file, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"5.3.4",
    [
     {restart_application, inets}
@@ -42,24 +49,16 @@
    [
     {restart_application, inets}
    ]
-  }, 
-  {"5.2",
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.1.3",
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.1.2",
-   [
-    {restart_application, inets}
-   ]
   }     
  ],
  [	
+  {"5.3.5",
+   [
+    {load_module, http_util, soft_purge, soft_purge, []},
+    {load_module, httpd_util, soft_purge, soft_purge, [http_util]},
+    {load_module, httpd_file, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"5.3.4",
    [
     {restart_application, inets}
@@ -84,21 +83,6 @@
    [
     {restart_application, inets}
    ]
-  }, 
-  {"5.2",
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.1.3",
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.1.2",
-   [
-    {restart_application, inets}
-   ]
   }     
  ]
 }.
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index feb29107bf..6f5f4eb9f7 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -1,9 +1,11 @@
 APPLICATION = inets
-INETS_VSN   = 5.3.5
+INETS_VSN   = 5.3.6
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
 
-TICKETS = OTP-8940
+TICKETS = OTP-9655
+
+TICKETS_5_3_5 = OTP-8940
 
 TICKETS_5_3_4 = OTP-8739 OTP-8741 OTP-8742
 
-- 
cgit v1.2.3