Changeset 4313

Timestamp:

03/09/09 15:02:34 (4 years ago)

Author:

Cyrus

Message:

Improved httpclient

Files:

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

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

@@ -23 +23 @@
 
 local type, pairs, ipairs, tonumber = type, pairs, ipairs, tonumber
+local unpack = unpack
 
 module "luci.httpclient"
@@ -161 +162 @@
     end
     
+    if type(options.body) == "function" then
+        options.method = options.method or "POST"
+    end
+
     -- Assemble message
     local message = {(options.method or "GET") .. " " .. path .. " " .. protocol}
@@ -195 +200 @@
     if type(options.body) == "string" then
         sock:sendall(options.body)
+    elseif type(options.body) == "function" then
+        local res = {options.body(sock)}
+        if not res[1] then
+            sock:close()
+            return unpack(res)
+        end
     end
     
@@ -202 +213 @@
     
     if not line then
+        sock:close()
         return nil, code, error
     end
     
-    local protocol, status, msg = line:match("^(HTTP/[0-9.]+) ([0-9]+) (.*)")
+    local protocol, status, msg = line:match("^([%w./]+) ([0-9]+) (.*)")
     
     if not protocol then
+        sock:close()
         return nil, -3, "invalid response magic: " .. line
     end
@@ -229 +242 @@
     
     if not line then
+        sock:close()
         return nil, -4, "protocol error"
     end