Fixed redirect_local

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@283 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
erlyaws · Nov 19, 2002 · 35208ae · 35208ae
1 parent 24c5274
commit 35208ae
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 26 deletions.
diff --git a/include/yaws.hrl b/include/yaws.hrl
@@ -52,7 +52,7 @@
 
 %% server conf
 -record(sconf,
-	{port = 8000,                %% which port is this server lsitenintg to
+	{port = 8000,                %% which port is this server listening to
 	 rport,                      %% forced redirect port
 	 rmethod,                    %% forced redirect method
 	 docroot,                    %% path to the docs

diff --git a/src/yaws_server.erl b/src/yaws_server.erl
@@ -1098,29 +1098,29 @@ deliver_303(CliSock, Req, GC, SC) ->
     deliver_accumulated(#dcc{}, CliSock, GC, SC),
     done.
 
+redirect_scheme(SC) ->
+    case {SC#sconf.ssl,SC#sconf.rmethod} of
+	{_, Method} when list(Method) ->
+	    Method++"://";
+	{undefined,_} ->
+	    "http://";
+	{_SSl,_} ->
+	    "https://"
+    end.    
+
+redirect_port(SC) ->
+    case {SC#sconf.ssl, SC#sconf.port, SC#sconf.rport} of
+	{_,_,ForcePort} when integer(ForcePort) -> [$:|ForcePort];
+	{undefined, 80, _}                      -> "";
+	{undefined, Port, _}                    -> [$:|Port];
+	{_SSL, 443, _}                          -> "";
+	{_SSL, Port, _}                         -> [$:|Port]
+    end.    
+
 redirect_scheme_port(SC) ->
-    Scheme = case {SC#sconf.ssl,SC#sconf.rmethod} of
-		 {_, Method} when list(Method) ->
-		     Method++"://";
-		 {undefined,_} ->
-		     "http://";
-		 {_SSl,_} ->
-		     "https://"
-	     end,
-    PortPart = case {SC#sconf.ssl, SC#sconf.port, SC#sconf.rport} of
-		   {_,_,ForcePort} when integer(ForcePort) ->
-		       io_lib:format(":~w",[ForcePort]);
-		   {undefined, 80, _} ->
-		       "";
-		   {undefined, Port, _} ->
-		       io_lib:format(":~w",[Port]);
-		   {_SSL, 443, _} ->
-		       "";
-		   {_SSL, Port, _} ->
-		       io_lib:format(":~w",[Port])
-	       end,
+    Scheme = redirect_scheme(SC),
+    PortPart = redirect_port(SC),
     {Scheme, PortPart}.
-
 
 servername_sans_port(Servername) ->
     case string:chr(Servername, $:) of
@@ -1475,11 +1475,18 @@ handle_out_reply({redirect_local, Path0}, _DCC, _LineNo, _YawsFile, SC, A) ->
 	       P ->
 		   P
 	   end,
-    {Scheme, PortPart} = redirect_scheme_port(SC),
+    Scheme = redirect_scheme(SC),
+    Arg = hd(A),
+    Headers = Arg#arg.headers,
     set_status_code(redirect_code(A)),
-    accumulate_header(["Location: ", Scheme,
-		       servername_sans_port(SC#sconf.servername), 
-		       PortPart, Path]),
+    if 
+	SC#sconf.rport /= undefined ->
+	    Port = redirect_port(SC),
+	    accumulate_header(["Location: ", Scheme,
+			       servername_sans_port(Headers#headers.host), Port, Path]);
+	true ->
+	    accumulate_header(["Location: ", Scheme, Headers#headers.host, Path])
+    end,
     ok;
 
 handle_out_reply({redirect, URL}, _DCC, _LineNo, _YawsFile, _SC, A) ->