X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fhttp%2Fluasrc%2Fhttp%2Fprotocol.lua;h=cd482a94fc680eea892de21ffc13f6d4eea32c9b;hp=ab696d58c85f67e5ddcf911ac726e9eb93027688;hb=0969279c41a31733a4c1b6c9a9fa769a6bbc7ee9;hpb=85b3ee12c2d67451f8355ddd3111ab347ca2312b

diff --git a/libs/http/luasrc/http/protocol.lua b/libs/http/luasrc/http/protocol.lua
index ab696d58c..cd482a94f 100644
--- a/libs/http/luasrc/http/protocol.lua
+++ b/libs/http/luasrc/http/protocol.lua
@@ -248,7 +248,7 @@ process_states['headers'] = function( msg, chunk )
 	if chunk ~= nil then
 
 		-- Look for a valid header format
-		local hdr, val = chunk:match( "^([A-Z][A-Za-z0-9%-_]+): +(.+)$" )
+		local hdr, val = chunk:match( "^([A-Za-z][A-Za-z0-9%-_]+): +(.+)$" )
 
 		if type(hdr) == "string" and hdr:len() > 0 and
 		   type(val) == "string" and val:len() > 0
@@ -563,12 +563,14 @@ function parse_message_header( src )
 			-- Populate common environment variables
 			msg.env = {
 				CONTENT_LENGTH    = msg.headers['Content-Length'];
-				CONTENT_TYPE      = msg.headers['Content-Type'];
+				CONTENT_TYPE      = msg.headers['Content-Type'] or msg.headers['Content-type'];
 				REQUEST_METHOD    = msg.request_method:upper();
 				REQUEST_URI       = msg.request_uri;
 				SCRIPT_NAME       = msg.request_uri:gsub("?.+$","");
 				SCRIPT_FILENAME   = "";		-- XXX implement me
-				SERVER_PROTOCOL   = "HTTP/" .. string.format("%.1f", msg.http_version)
+				SERVER_PROTOCOL   = "HTTP/" .. string.format("%.1f", msg.http_version);
+				QUERY_STRING      = msg.request_uri:match("?")
+					and msg.request_uri:gsub("^.+?","") or ""
 			}
 
 			-- Populate HTTP_* environment variables
@@ -617,7 +619,7 @@ function parse_message_body( src, msg, filecb )
 
 	-- Is it application/x-www-form-urlencoded ?
 	elseif msg.env.REQUEST_METHOD == "POST" and msg.env.CONTENT_TYPE and
-	       msg.env.CONTENT_TYPE == "application/x-www-form-urlencoded"
+	       msg.env.CONTENT_TYPE:match("^application/x%-www%-form%-urlencoded")
 	then
 		return urldecode_message_body( src, msg, filecb )