From 4dcabdcc5ab7f41189ec3937e84b323d80d6df57 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 7 Nov 2017 10:25:16 +0100
Subject: inets: Add missing guard

Add test in the correct place which was the reason the guard became missing
without being noticed.
---
 lib/inets/src/http_server/httpd_esi.erl     | 2 +-
 lib/inets/src/http_server/httpd_example.erl | 2 +-
 lib/inets/test/http_format_SUITE.erl        | 5 ++++-
 lib/inets/test/httpd_SUITE.erl              | 7 +++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

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/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"}].
-- 
cgit v1.2.3


From 07bfe477c0a06fbd7df5e216a7c072594fd17e4d Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 9 Nov 2017 11:23:49 +0100
Subject: inets: Prepare for release

---
 lib/inets/src/inets_app/inets.appup.src | 4 ++++
 lib/inets/vsn.mk                        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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/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)"
-- 
cgit v1.2.3