Changeset 4324

Timestamp:

03/12/09 21:14:55 (4 years ago)

Author:

Cyrus

Message:

httpclient: handle redirects more graceful

Files:

• luci/trunk/libs/httpclient/luasrc/httpclient.lua (modified) (3 diffs)

luci/trunk/libs/httpclient/luasrc/httpclient.lua

@@ -224 +224 @@
     end
     
-    local response = {status = line, headers = {}, code = 0, cookies = {}}
+    local response = {
+        status = line, headers = {}, code = 0, cookies = {}, uri = uri
+    }
     
     line = linesrc()
@@ -293 +295 @@
         if response.code == 301 or response.code == 302 or response.code == 307
          and response.headers.Location then
-            local nexturi = response.headers.Location
-            if not nexturi:find("https?://") then
-                nexturi = pr .. "://" .. host .. ":" .. port .. nexturi
+            local nuri = response.headers.Location or response.headers.location
+            if not nuri then
+                return nil, -5, "invalid reference"
+            end
+            if not nuri:find("https?://") then
+                nuri = pr .. "://" .. host .. ":" .. port .. nuri
             end
             
@@ -301 +306 @@
             sock:close()
             
-            return request_raw(nexturi, options)
+            return request_raw(nuri, options)
         end
     end