Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

send Cookie in a single header line, follow browser behavior

Browse source
This commit is contained in:
Yuzo 2015-01-22 12:50:58 +08:00
parent c30cf9abd4
commit b6d4f32dcc
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libs/luci-lib-httpclient/luasrc/httpclient.lua
View file

@ -176,6 +176,25 @@ function request_raw(uri, options)
options.method = options.method or "POST"
end
if options.cookies then
local cookiedata = {}
for _, c in ipairs(options.cookies) do
local cdo = c.flags.domain
local cpa = c.flags.path
if (cdo == host or cdo == "."..host or host:sub(-#cdo) == cdo)
and (cpa == path or cpa == "/" or cpa .. "/" == path:sub(#cpa+1))
and (not c.flags.secure or pr == "https")
then
cookiedata[#cookiedata+1] = c.key .. "=" .. c.value
end
end
if headers["Cookie"] then
headers["Cookie"] = headers["Cookie"] .. "; " .. table.concat(cookiedata, "; ")
else
headers["Cookie"] = table.concat(cookiedata, "; ")
end
end
-- Assemble message
local message = {(options.method or "GET") .. " " .. path .. " " .. protocol}
@ -188,20 +207,7 @@ function request_raw(uri, options)
end
end
end
if options.cookies then
for _, c in ipairs(options.cookies) do
local cdo = c.flags.domain
local cpa = c.flags.path
if (cdo == host or cdo == "."..host or host:sub(-#cdo) == cdo)
and (cpa == path or cpa == "/" or cpa .. "/" == path:sub(#cpa+1))
and (not c.flags.secure or pr == "https")
then
message[#message+1] = "Cookie: " .. c.key .. "=" .. c.value
end
end
end
message[#message+1] = ""
message[#message+1] = ""