Changeset 5135

Timestamp:

07/24/09 19:23:59 (4 years ago)

Author:

Cyrus

Message:

Merge from fonosfera

Files:

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

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

@@ -172 +172 @@
     options.headers = options.headers or {}
     local hdr = options.headers
-    
-    local file, code, msg = prepare_fd(target)
-    if not file then
-        return file, code, msg
-    end
-    
-    local off = file:tell()
-    
-    -- Set content range
-    if off > 0 then
-        hdr.Range = hdr.Range or ("bytes=" .. off .. "-")  
+    local file, code, msg
+    
+    if target then
+        file, code, msg = prepare_fd(target)
+        if not file then
+            return file, code, msg
+        end
+    
+        local off = file:tell()
+        
+        -- Set content range
+        if off > 0 then
+            hdr.Range = hdr.Range or ("bytes=" .. off .. "-")  
+        end
     end
     
@@ -188 +191 @@
     if not code then
         -- No success
-        file:close()
+        if file then
+            file:close()
+        end
         return code, resp, buffer
     elseif hdr.Range and code ~= 206 then
         -- We wanted a part but we got the while file
         sock:close()
-        file:close()
+        if file then
+            file:close()
+        end
         return nil, -4, code, resp
     elseif not hdr.Range and code ~= 200 then
         -- We encountered an error
         sock:close()
-        file:close()
+        if file then
+            file:close()
+        end
         return nil, -4, code, resp
     end
@@ -205 +214 @@
         local stat = {cbs.on_header(file, code, resp)}
         if stat[1] == false then
-            file:close()
+            if file then
+                file:close()
+            end
             sock:close()
             return unpack(stat)
-        end
+        elseif stat[2] then
+            file = file and stat[2]
+        end
+    end
+    
+    if not file then
+        return nil, -5, "no target given"
     end