X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fluci-lib-httpclient%2Fluasrc%2Fhttpclient.lua;h=04175b3647167560d176209d3d2713079fdb4fe7;hp=94c2e9ecac34bf1cf86a6c447288d94667660309;hb=eb4571c6dc7e9f99133de1d7df23024ba6d31d9e;hpb=7a3493b1f7d75a3945279115324cf2ff4da26b7b

diff --git a/libs/luci-lib-httpclient/luasrc/httpclient.lua b/libs/luci-lib-httpclient/luasrc/httpclient.lua
index 94c2e9eca..04175b364 100644
--- a/libs/luci-lib-httpclient/luasrc/httpclient.lua
+++ b/libs/luci-lib-httpclient/luasrc/httpclient.lua
@@ -7,7 +7,7 @@ local nixio = require "nixio"
 local ltn12 = require "luci.ltn12"
 local util = require "luci.util"
 local table = require "table"
-local http = require "luci.http.protocol"
+local http = require "luci.http"
 local date = require "luci.http.protocol.date"
 
 local type, pairs, ipairs, tonumber = type, pairs, ipairs, tonumber
@@ -97,7 +97,11 @@ end
 function request_raw(uri, options)
 	options = options or {}
 	local pr, auth, host, port, path
-	
+
+	if options.params then
+		uri = uri .. '?' .. http.urlencode_params(options.params)
+	end
+
 	if uri:find("%[") then
 		if uri:find("@") then
 			pr, auth, host, port, path = uri:match("(%w+)://(.+)@(%b[]):?([0-9]*)(.*)")
@@ -176,20 +180,8 @@ function request_raw(uri, options)
 		options.method = options.method or "POST"
 	end
 
-	-- Assemble message
-	local message = {(options.method or "GET") .. " " .. path .. " " .. protocol}
-	
-	for k, v in pairs(headers) do
-		if type(v) == "string" or type(v) == "number" then
-			message[#message+1] = k .. ": " .. v
-		elseif type(v) == "table" then
-			for i, j in ipairs(v) do
-				message[#message+1] = k .. ": " .. j
-			end
-		end
-	end
-	
 	if options.cookies then
+		local cookiedata = {}
 		for _, c in ipairs(options.cookies) do
 			local cdo = c.flags.domain
 			local cpa = c.flags.path
@@ -197,11 +189,29 @@ function request_raw(uri, options)
 			 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
+				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}
 	
+	for k, v in pairs(headers) do
+		if type(v) == "string" or type(v) == "number" then
+			message[#message+1] = k .. ": " .. v
+		elseif type(v) == "table" then
+			for i, j in ipairs(v) do
+				message[#message+1] = k .. ": " .. j
+			end
+		end
+	end
+
 	message[#message+1] = ""
 	message[#message+1] = ""
 	
@@ -323,7 +333,7 @@ function request_raw(uri, options)
 		end
 	end
 	
-	return response.code, response, linesrc(true), sock
+	return response.code, response, linesrc(true)..sock:readall(), sock
 end
 
 function cookie_parse(cookiestr)