Merge branch 'maint'

* maint:
  Updated OTP version
  Update release notes
  Update version numbers
  inets: Prepare for release
  inets: Add missing guard
  Avoid WindowBits=8 as per the manual
  Fix deflateParams on zlib 1.2.11
  Ignore empty binaries in enif_inspect_iovec
  Emasculate writable binaries on entering an iovec
  Only apply EOS behaviors if there's pending data

Conflicts:
	OTP_VERSION

8 files changed, 82 insertions, 14 deletions

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 1ff6aefaa7..07e29b5542 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,26 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 6.4.3</title>
+  <section><title>Inets 6.4.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Correct the handling of location headers so that the
+	    status code is not hard coded. This should have been
+	    fixed by commit 2cc5ba70cbbc6b3ace81a2a0324417c3b65265bb
+	    but unfortunately was broken during a code refactoring
+	    and unnoticed due to a faulty placed test case.</p>
+          <p>
+	    Own Id: OTP-14761</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.4.3</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/inets/src/http_server/httpd_esi.erl b/lib/inets/src/http_server/httpd_esi.erl
index fd50934d00..f5493f6fad 100644
--- a/lib/inets/src/http_server/httpd_esi.erl
+++ b/lib/inets/src/http_server/httpd_esi.erl
@@ -86,7 +86,7 @@ handle_headers([], NewHeaders, StatusCode, _) ->
 handle_headers([Header | Headers], NewHeaders, StatusCode, NoESIStatus) -> 
     {FieldName, FieldValue} = httpd_response:split_header(Header, []),
     case FieldName of
-	"location" ->
+	"location" when NoESIStatus == true ->
             handle_headers(Headers, 
                            [{FieldName, FieldValue} | NewHeaders], 
                            302, NoESIStatus);
diff --git a/lib/inets/src/http_server/httpd_example.erl b/lib/inets/src/http_server/httpd_example.erl
index adbbf64685..47a8c48d01 100644
--- a/lib/inets/src/http_server/httpd_example.erl
+++ b/lib/inets/src/http_server/httpd_example.erl
@@ -91,7 +91,7 @@ yahoo(_Env,_Input) ->
   "Location: http://www.yahoo.com\r\n\r\n".
 
 new_status_and_location(_Env,_Input) ->
-  "status:201\r\n Location: http://www.yahoo.com\r\n\r\n".
+  "status:201 Created\r\n Location: http://www.yahoo.com\r\n\r\n".
 
 default(Env,Input) ->
   [header(),
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index a86413147c..fdf4cc6e07 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,10 +18,14 @@
 %% %CopyrightEnd%
 {"%VSN%",
  [
+  {<<"6.4.3">>, [{load_module, httpd_esi, 
+		  soft_purge, soft_purge, []}]},
   {<<"6\\..*">>,[{restart_application, inets}]},
   {<<"5\\..*">>,[{restart_application, inets}]}
  ],
  [
+  {<<"6.4.3">>, [{load_module, httpd_esi, 
+		  soft_purge, soft_purge, []}]},
   {<<"6\\..*">>,[{restart_application, inets}]},
   {<<"5\\..*">>,[{restart_application, inets}]}
  ]
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index 9a13ed3d17..647eff4f7c 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -536,7 +536,10 @@ esi_parse_headers(Config) when is_list(Config) ->
 	httpd_esi:handle_headers(Headers2),
     
    {ok,[{"location","/foo/bar.html"}], 302} = 
-	httpd_esi:handle_headers("location:/foo/bar.html\r\n").
+	httpd_esi:handle_headers("location:/foo/bar.html\r\n"),
+    
+    {ok,[{"location","http://foo/bar.html"}],201} =
+        httpd_esi:handle_headers("status:201 Created\r\nlocation:http://foo/bar.html\r\n").
 
 %%--------------------------------------------------------------------
 cgi_parse_headers() ->
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 0c649d9abf..9a85c51d24 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -923,8 +923,11 @@ esi(Config) when is_list(Config) ->
 		      {no_header, "cache-control"}]),
     ok = http_status("GET /cgi-bin/erl/httpd_example:peer ",
 	  	     Config, [{statuscode, 200},
-	 	      {header, "peer-cert-exist", peer(Config)}]).
-
+                              {header, "peer-cert-exist", peer(Config)}]),
+    ok = http_status("GET /cgi-bin/erl/httpd_example:new_status_and_location ",
+                     Config, [{statuscode, 201},
+                              {header, "location"}]).
+    
 %%-------------------------------------------------------------------------
 esi_put() ->
     [{doc, "Test mod_esi PUT"}].
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 108d259823..560d524bac 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 6.4.3
+INETS_VSN   = 6.4.4
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index 7be7e503df..f203ef878f 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -166,7 +166,7 @@ api_deflateInit(Config) when is_list(Config) ->
 			  ?m(ok, zlib:deflateInit(Z12,default,deflated,-Wbits,8,default)),
 			  ?m(ok,zlib:close(Z11)),
 			  ?m(ok,zlib:close(Z12))
-		  end, lists:seq(8, 15)),
+		  end, lists:seq(9, 15)),
 
     lists:foreach(fun(MemLevel) ->
 			  Z = zlib:open(),
@@ -213,12 +213,46 @@ api_deflateReset(Config) when is_list(Config) ->
 
 %% Test deflateParams.
 api_deflateParams(Config) when is_list(Config) ->
+    Levels = [none, default, best_speed, best_compression] ++ lists:seq(0, 9),
+    Strategies = [filtered, huffman_only, rle, default],
+
     Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
-    ?m(L when is_list(L), zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, none)),
-    ?m(ok, zlib:deflateParams(Z1, best_compression, huffman_only)),
-    ?m(L when is_list(L), zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, sync)),
-    ?m(ok, zlib:close(Z1)).
+
+    ApiTest =
+        fun(Level, Strategy) ->
+            ?m(ok, zlib:deflateParams(Z1, Level, Strategy)),
+            ?m(ok, zlib:deflateReset(Z1))
+        end,
+
+    [ ApiTest(Level, Strategy) || Level <- Levels, Strategy <- Strategies ],
+
+    ?m(ok, zlib:close(Z1)),
+
+    FlushTest =
+        fun FlushTest(Size, Level, Strategy) ->
+            Z = zlib:open(),
+            ok = zlib:deflateInit(Z, default),
+            Data = gen_determ_rand_bytes(Size),
+            case zlib:deflate(Z, Data, none) of
+                [<<120, 156>>] ->
+                    %% All data is present in the internal zlib state, and will
+                    %% be flushed on deflateParams.
+
+                    ok = zlib:deflateParams(Z, Level, Strategy),
+                    Compressed = [<<120, 156>>, zlib:deflate(Z, <<>>, finish)],
+                    Data = zlib:uncompress(Compressed),
+                    zlib:close(Z),
+
+                    FlushTest(Size + (1 bsl 10), Level, Strategy);
+                _Other ->
+                    ok
+            end
+        end,
+
+    [ FlushTest(1, Level, Strategy) || Level <- Levels, Strategy <- Strategies ],
+
+    ok.
 
 %% Test deflate.
 api_deflate(Config) when is_list(Config) ->
@@ -652,6 +686,11 @@ api_g_un_zip(Config) when is_list(Config) ->
     Concatenated = <<Bin/binary, Bin/binary>>,
     ?m(Concatenated, zlib:gunzip([Comp, Comp])),
 
+    %% Don't explode if the uncompressed size is a perfect multiple of the
+    %% internal inflate chunk size.
+    ChunkSizedData = <<0:16384/unit:8>>,
+    ?m(ChunkSizedData, zlib:gunzip(zlib:gzip(ChunkSizedData))),
+
     %% Bad CRC; bad length.
     BadCrc = bad_crc_data(),
     ?m(?EXIT(data_error),(catch zlib:gunzip(BadCrc))),
@@ -762,13 +801,13 @@ zip_usage({run,ZIP,ORIG}) ->
 
     ?m(ok, zlib:deflateInit(Z, default, deflated, -15, 8, default)),
     C2 = zlib:deflate(Z, ORIG, finish),
-    ?m(true, C1 == list_to_binary(C2)),
+    ?m(ORIG, zlib:unzip(C2)),
     ?m(ok, zlib:deflateEnd(Z)),
 
     ?m(ok, zlib:deflateInit(Z, none, deflated, -15, 8, filtered)),
     ?m(ok, zlib:deflateParams(Z, default, default)),
     C3 = zlib:deflate(Z, ORIG, finish),
-    ?m(true, C1 == list_to_binary(C3)),
+    ?m(ORIG, zlib:unzip(C3)),
     ?m(ok, zlib:deflateEnd(Z)),
 
     ok = zlib:close(Z),