inets: httpd - do not hardcode 302 status for location

If a status code is provide by the ESI script that status code should have
precedence over internal defaults.

Also remove RFC 2616 requirement that URI must be absolute, that requirement
is relaxed by RFC 7231.

5 files changed, 58 insertions, 69 deletions

diff --git a/lib/inets/src/http_server/httpd_esi.erl b/lib/inets/src/http_server/httpd_esi.erl
index 9406b47802..fd50934d00 100644
--- a/lib/inets/src/http_server/httpd_esi.erl
+++ b/lib/inets/src/http_server/httpd_esi.erl
@@ -66,7 +66,7 @@ handle_headers("") ->
     {ok, [], 200};
 handle_headers(Headers) ->
     NewHeaders = string:tokens(Headers, ?CRLF),
-    handle_headers(NewHeaders, [], 200).
+    handle_headers(NewHeaders, [], 200, true).
 
 %%%========================================================================
 %%% Internal functions
@@ -80,21 +80,17 @@ parse_headers([?CR, ?LF, ?CR, ?LF | Rest], Acc) ->
 parse_headers([Char | Rest], Acc) ->
     parse_headers(Rest, [Char | Acc]).
  
-handle_headers([], NewHeaders, StatusCode) ->
+handle_headers([], NewHeaders, StatusCode, _) ->
     {ok, NewHeaders, StatusCode};
 
-handle_headers([Header | Headers], NewHeaders, StatusCode) -> 
+handle_headers([Header | Headers], NewHeaders, StatusCode, NoESIStatus) -> 
     {FieldName, FieldValue} = httpd_response:split_header(Header, []),
     case FieldName of
 	"location" ->
-	    case http_request:is_absolut_uri(FieldValue) of
-		true ->
-		    handle_headers(Headers, 
-				   [{FieldName, FieldValue} | NewHeaders], 
-				   302);
-		false ->
-		    {proceed, FieldValue}
-	    end;
+            handle_headers(Headers, 
+                           [{FieldName, FieldValue} | NewHeaders], 
+                           302, NoESIStatus);
+	
 	"status" ->
 	    NewStatusCode = 
 		case httpd_util:split(FieldValue," ",2) of
@@ -103,8 +99,9 @@ handle_headers([Header | Headers], NewHeaders, StatusCode) ->
 		    _ ->
 			200
 		end,
-	    handle_headers(Headers, NewHeaders, NewStatusCode);
+	    handle_headers(Headers, NewHeaders, NewStatusCode, false);
 	_ -> 
 	    handle_headers(Headers, 
-			     [{FieldName, FieldValue}| NewHeaders], StatusCode)
-    end.	
+                           [{FieldName, FieldValue}| NewHeaders], StatusCode,
+                           NoESIStatus)
+    end.	 
diff --git a/lib/inets/src/http_server/httpd_example.erl b/lib/inets/src/http_server/httpd_example.erl
index 45b6deba97..adbbf64685 100644
--- a/lib/inets/src/http_server/httpd_example.erl
+++ b/lib/inets/src/http_server/httpd_example.erl
@@ -20,7 +20,7 @@
 %%
 -module(httpd_example).
 -export([print/1]).
--export([get/2, put/2, post/2, yahoo/2, test1/2, get_bin/2, peer/2]).
+-export([get/2, put/2, post/2, yahoo/2, test1/2, get_bin/2, peer/2,new_status_and_location/2]).
 
 -export([newformat/3, post_chunked/3]).
 %% These are used by the inets test-suite
@@ -90,6 +90,9 @@ post(Env,Input) ->
 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".
+
 default(Env,Input) ->
   [header(),
    top("Default Example"),
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl
index 3a589ca5f0..3206d957d9 100644
--- a/lib/inets/src/http_server/mod_esi.erl
+++ b/lib/inets/src/http_server/mod_esi.erl
@@ -339,26 +339,21 @@ erl_scheme_webpage_whole(Mod, Func, Env, Input, ModData) ->
 	    {Headers, Body} = 
 		httpd_esi:parse_headers(lists:flatten(Response)),
 	    Length =  httpd_util:flatlength(Body),
-	    case httpd_esi:handle_headers(Headers) of
-		{proceed, AbsPath} ->
-		    {proceed, [{real_name, httpd_util:split_path(AbsPath)} 
-			       | ModData#mod.data]};
-		{ok, NewHeaders, StatusCode} ->
-		    send_headers(ModData, StatusCode, 
-				 [{"content-length", 
-				   integer_to_list(Length)}| NewHeaders]),
-		    case ModData#mod.method of
-			"HEAD" ->
-			    {proceed, [{response, {already_sent, 200, 0}} | 
-				       ModData#mod.data]};
-			_ ->
-			    httpd_response:send_body(ModData, 
-						     StatusCode, Body),
-			    {proceed, [{response, {already_sent, 200, 
-						  Length}} | 
-				       ModData#mod.data]}
-		    end
-	    end
+            {ok, NewHeaders, StatusCode} = httpd_esi:handle_headers(Headers), 
+            send_headers(ModData, StatusCode, 
+                         [{"content-length", 
+                           integer_to_list(Length)}| NewHeaders]),
+            case ModData#mod.method of
+                "HEAD" ->
+                    {proceed, [{response, {already_sent, 200, 0}} | 
+                               ModData#mod.data]};
+                _ ->
+                    httpd_response:send_body(ModData, 
+                                             StatusCode, Body),
+                    {proceed, [{response, {already_sent, 200, 
+                                           Length}} | 
+                               ModData#mod.data]}
+            end
     end.
 
 %% New API that allows the dynamic wepage to be sent back to the client 
@@ -398,29 +393,23 @@ deliver_webpage_chunk(#mod{config_db = Db} = ModData, Pid, Timeout) ->
         {continue, _} = Continue ->
             Continue;
 	{Headers, Body} ->
-	    case httpd_esi:handle_headers(Headers) of
-		{proceed, AbsPath} ->
-		    {proceed, [{real_name, httpd_util:split_path(AbsPath)} 
-			       | ModData#mod.data]};
-		{ok, NewHeaders, StatusCode} ->
-		    IsDisableChunkedSend = 
-			httpd_response:is_disable_chunked_send(Db),
-		    case (ModData#mod.http_version =/= "HTTP/1.1") or
-			(IsDisableChunkedSend) of
-			true ->
-			    send_headers(ModData, StatusCode, 
-					 [{"connection", "close"} | 
-					  NewHeaders]);
-			false ->
-			    send_headers(ModData, StatusCode, 
-					 [{"transfer-encoding", 
-					   "chunked"} | NewHeaders])
-		    end,    
-		    handle_body(Pid, ModData, Body, Timeout, length(Body), 
-				IsDisableChunkedSend)
-	    end;
-	timeout ->
-	    send_headers(ModData, 504, [{"connection", "close"}]),
+            {ok, NewHeaders, StatusCode} = httpd_esi:handle_headers(Headers),
+                IsDisableChunkedSend = httpd_response:is_disable_chunked_send(Db),
+            case (ModData#mod.http_version =/= "HTTP/1.1") or
+                (IsDisableChunkedSend) of
+                true ->
+                    send_headers(ModData, StatusCode, 
+                                 [{"connection", "close"} | 
+                                  NewHeaders]);
+                false ->
+                    send_headers(ModData, StatusCode, 
+                                 [{"transfer-encoding", 
+                                   "chunked"} | NewHeaders])
+            end,    
+            handle_body(Pid, ModData, Body, Timeout, length(Body), 
+                        IsDisableChunkedSend);
+        timeout ->
+            send_headers(ModData, 504, [{"connection", "close"}]),
 	    httpd_socket:close(ModData#mod.socket_type, ModData#mod.socket),
 	    {proceed,[{response, {already_sent, 200, 0}} | ModData#mod.data]}
     end.
@@ -560,15 +549,10 @@ eval(#mod{method = Method} = ModData, ESIBody, Modules)
 		{ok, Response} ->
 		    {Headers, _} = 
 			httpd_esi:parse_headers(lists:flatten(Response)),
-		    case httpd_esi:handle_headers(Headers) of
-			{ok, _, StatusCode} ->
-			    {proceed,[{response, {StatusCode, Response}} | 
-				      ModData#mod.data]};
-			{proceed, AbsPath} ->
-			    {proceed, [{real_name, AbsPath} | 
-				       ModData#mod.data]}
-		    end
-	    end;
+                    {ok, _, StatusCode} =httpd_esi:handle_headers(Headers), 
+                    {proceed,[{response, {StatusCode, Response}} | 
+                              ModData#mod.data]}
+            end;
 	false ->
 	    {proceed,[{status,
 		       {403, ModData#mod.request_uri,
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index 4e10a97f58..9a13ed3d17 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -535,7 +535,7 @@ esi_parse_headers(Config) when is_list(Config) ->
 	 {"location","http://foo.bar.se"}], 302} =
 	httpd_esi:handle_headers(Headers2),
     
-    {proceed,"/foo/bar.html"} = 
+   {ok,[{"location","/foo/bar.html"}], 302} = 
 	httpd_esi:handle_headers("location:/foo/bar.html\r\n").
 
 %%--------------------------------------------------------------------
diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl
index d9118aa1a4..2035b50248 100644
--- a/lib/inets/test/httpd_mod.erl
+++ b/lib/inets/test/httpd_mod.erl
@@ -779,9 +779,14 @@ esi(Type, Port, Host, Node) ->
 				       [{statuscode, 200},
 					{no_header, "cache-control"},
 					{version, "HTTP/1.0"}]),
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+				       "GET /cgi-bin/erl/httpd_example:new_status_and_location"
+				       " HTTP/1.1\r\n\r\n",
+				       [{statuscode, 201},
+                                        {header, "Location"},
+					{version, "HTTP/1.1"}]),
     ok.
 
-
 %%--------------------------------------------------------------------
 get(Type, Port, Host, Node) ->
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node,