Merge branch 'maint-20' into maint

* maint-20:
  Updated OTP version
  Update release notes
  Update version numbers
  inets: httpd correct server_name environment value
  inets: httpd - Add chunk handling of client data
  inets: Restore old behavior when parsing "+"
  inets: prepare for release

5 files changed, 38 insertions, 12 deletions

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 2f4f20347a..c85600d0be 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,41 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 6.4</title>
+  <section><title>Inets 6.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    http_uri aligned to follow RFC 3986 and not convert "+"
+	    to space when decoding URIs.</p>
+          <p>
+	    Own Id: OTP-14573</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Added new option max_client_body_chunk to httpd server to
+	    allow chunked delivery of PUT and POST data to mod_esi
+	    callback. Note, new mod_esi callback implementation is
+	    required.</p>
+          <p>
+	    Also correct value provided by server_name environment
+	    variable</p>
+          <p>
+	    Own Id: OTP-14450</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/inets/src/http_lib/http_uri.erl b/lib/inets/src/http_lib/http_uri.erl
index c4be5abd7c..7f1ca02014 100644
--- a/lib/inets/src/http_lib/http_uri.erl
+++ b/lib/inets/src/http_lib/http_uri.erl
@@ -117,8 +117,6 @@ decode(String) when is_list(String) ->
 decode(String) when is_binary(String) ->
     do_decode_binary(String).
 
-do_decode([$+|Rest]) ->
-    [$ |do_decode(Rest)];
 do_decode([$%,Hex1,Hex2|Rest]) ->
     [hex2dec(Hex1)*16+hex2dec(Hex2)|do_decode(Rest)];
 do_decode([First|Rest]) ->
@@ -126,8 +124,6 @@ do_decode([First|Rest]) ->
 do_decode([]) ->
     [].
 
-do_decode_binary(<<$+, Rest/bits>>) ->
-    <<$ , (do_decode_binary(Rest))/binary>>;
 do_decode_binary(<<$%, Hex:2/binary, Rest/bits>>) ->
     <<(binary_to_integer(Hex, 16)), (do_decode_binary(Rest))/binary>>;
 do_decode_binary(<<First:1/binary, Rest/bits>>) ->
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index f9ad8709d9..a86413147c 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,14 +18,10 @@
 %% %CopyrightEnd%
 {"%VSN%",
  [
-  {<<"6.2.4">>, [{load_module, httpd_request_handler, 
-		  soft_purge, soft_purge, []}]},
   {<<"6\\..*">>,[{restart_application, inets}]},
   {<<"5\\..*">>,[{restart_application, inets}]}
  ],
  [
-  {<<"6.2.4">>, [{load_module, httpd_request_handler, 
-		  soft_purge, soft_purge, []}]},
   {<<"6\\..*">>,[{restart_application, inets}]},
   {<<"5\\..*">>,[{restart_application, inets}]}
  ]
diff --git a/lib/inets/test/uri_SUITE.erl b/lib/inets/test/uri_SUITE.erl
index 3e7799141c..f973296af6 100644
--- a/lib/inets/test/uri_SUITE.erl
+++ b/lib/inets/test/uri_SUITE.erl
@@ -277,8 +277,8 @@ encode_decode(Config) when is_list(Config) ->
     ?assertEqual("foo%20bar", http_uri:encode("foo bar")),
     ?assertEqual(<<"foo%20bar">>, http_uri:encode(<<"foo bar">>)),
 
-    ?assertEqual("foo bar", http_uri:decode("foo+bar")),
-    ?assertEqual(<<"foo bar">>, http_uri:decode(<<"foo+bar">>)),
+    ?assertEqual("foo+bar", http_uri:decode("foo+bar")),
+    ?assertEqual(<<"foo+bar">>, http_uri:decode(<<"foo+bar">>)),
     ?assertEqual("foo bar", http_uri:decode("foo%20bar")),
     ?assertEqual(<<"foo bar">>, http_uri:decode(<<"foo%20bar">>)),
     ?assertEqual("foo\r\n", http_uri:decode("foo%0D%0A")),
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 96796f11c0..c4314f1ab5 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 6.4
+INETS_VSN   = 6.4.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"