From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 16 Jun 2009 14:41:43 +0000 (+0000)
Subject: libs/lucid-http: use SERVER_ADDR as fallback
X-Git-Tag: 0.10.0~1547
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=8c359115f9d515d358403897f34c69757adf7af6

libs/lucid-http: use SERVER_ADDR as fallback
---

diff --git a/libs/lucid-http/luasrc/lucid/http/handler/catchall.lua b/libs/lucid-http/luasrc/lucid/http/handler/catchall.lua
index a5cdce534..13272d91e 100644
--- a/libs/lucid-http/luasrc/lucid/http/handler/catchall.lua
+++ b/libs/lucid-http/luasrc/lucid/http/handler/catchall.lua
@@ -39,7 +39,7 @@ end
 function Redirect.handle_GET(self, request)
 	local target = self.target
 	local protocol = request.env.HTTPS and "https://" or "http://"
-	local server
+	local server = request.env.SERVER_ADDR
 
 	if request.env.REMOTE_ADDR and not request.env.REMOTE_ADDR:find(":") then
 		local compare = ip.IPv4(request.env.REMOTE_ADDR)
@@ -51,9 +51,8 @@ function Redirect.handle_GET(self, request)
 				end
 			end
 		end
-	else
-		server = request.env.SERVER_ADDR
 	end
+
 	if server:find(":") then
 		server = "[" .. server .. "]"
 	end
@@ -85,4 +84,4 @@ Redirect.handle_POST = Redirect.handle_GET
 function Redirect.handle_HEAD(self, request)
 	local stat, head = self:handle_GET(request)
 	return stat, head
-end
\ No newline at end of file
+end