starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[httpclient] name clash: error is alread used by the basic library in Lua

This commit is contained in:
Bart Van Der Meerssche 2011-03-05 10:09:07 +01:00
parent a826343f6c
commit 5a2122a0c5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mote/v2/openwrt/package/luci/libs/httpclient/luasrc/httpclient.lua
View File

@ -146,9 +146,9 @@ function request_raw(uri, options)
end end
sock = tls:create(sock) sock = tls:create(sock)
local stat, code, error = sock:connect() local stat, code, err = sock:connect()
if not stat then if not stat then
return stat, code, error return stat, code, err
end end
end end
@ -216,11 +216,11 @@ function request_raw(uri, options)
-- Create source and fetch response -- Create source and fetch response
local linesrc = sock:linesource() local linesrc = sock:linesource()
local line, code, error = linesrc() local line, code, err = linesrc()
if not line then if not line then
sock:close() sock:close()
return nil, code, error return nil, code, err
end end
local protocol, status, msg = line:match("^([%w./]+) ([0-9]+) (.*)") local protocol, status, msg = line:match("^([%w./]+) ([0-9]+) (.*)")