From b6d4f32dcc4bba2645d3758c3dc027fe0e2b4d14 Mon Sep 17 00:00:00 2001
From: Yuzo <hyzgog@gmail.com>
Date: Thu, 22 Jan 2015 12:50:58 +0800
Subject: [PATCH] send Cookie in a single header line, follow browser behavior

---
 .../luci-lib-httpclient/luasrc/httpclient.lua | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/libs/luci-lib-httpclient/luasrc/httpclient.lua b/libs/luci-lib-httpclient/luasrc/httpclient.lua
index c84a03b50a..af79695244 100644
--- a/libs/luci-lib-httpclient/luasrc/httpclient.lua
+++ b/libs/luci-lib-httpclient/luasrc/httpclient.lua
@@ -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] = ""