3 files changed, 38 insertions, 66 deletions

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index e3ebe5b0e..f5894bffc 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -84,7 +84,7 @@ end
 function httpdispatch(request)
 	luci.http.context.request = request
 	context.request = {}
-	local pathinfo = request.env.PATH_INFO or ""
+	local pathinfo = request:getenv("PATH_INFO") or ""
 
 	for node in pathinfo:gmatch("[^/]+") do
 		table.insert(context.request, node)
diff --git a/libs/web/luasrc/http.lua b/libs/web/luasrc/http.lua
index 0319f104f..89385a161 100644
--- a/libs/web/luasrc/http.lua
+++ b/libs/web/luasrc/http.lua
@@ -38,47 +38,51 @@ Request = luci.util.class()
 function Request.__init__(self, env, instream, errstream)
 	self.input = instream
 	self.error = errstream
-
-	-- Formdata tables
-	self.get = {}
-	self.post = {}
 	
+	-- Provide readline function
+	self.inputreader = self.input.readline
+	 or self.input.read and function() return self.input:read() end
+	 or self.input.receive and function() return self.input:receive() end
+	 or function() return nil end
+
 	-- File handler
 	self.filehandler = function() end
 	
-	-- Environment table
-	self.env = env
+	-- HTTP-Message table
+	self.message = {
+		env = env,
+		headers = {},
+		params = luci.http.protocol.urldecode_params("?"..env.QUERY_STRING),
+	}
 	
-	setmetatable(self.get, {__index =
+	setmetatable(self.message.params, {__index =
 		function(tbl, key)
-			tbl = luci.http.protocol.urldecode_params(self.env.QUERY_STRING)
+			luci.http.protocol.parse_message_body(
+			 self.inputreader,
+			 self.message,
+			 self.filehandler
+			)
+			
 			setmetatable(tbl, nil)
 			return rawget(tbl, key)
-		end })  
-		
-	setmetatable(self.post, {__index =
-		function(tbl, key)
-			tbl = luci.http.protocol.
-			setmetatable(tbl, nil)
-			return rawget(tbl, key)
-		end })  
+		end
+	})
 end
 
 function Request.formvalue(self, name, default)
-	return tostring(self.post[name] or self.get[name] or default)
+	if name then
+		return self.message.params[name] and tostring(self.message.params[name]) or default
+	else
+		return self.message.params
+	end
 end
 
 function Request.formvaluetable(self, prefix)
 	local vals = {}
 	prefix = prefix and prefix .. "." or "."
 	
-	for k, v in pairs(self.getvalue()) do
-		if k:find(prefix, 1, true) == 1 then
-			vals[k:sub(#prefix + 1)] = tostring(v)
-		end
-	end
-	
-	for k, v in pairs(self.postvalue()) do
+	local void = self.message.params[nil]
+	for k, v in pairs(self.message.params) do
 		if k:find(prefix, 1, true) == 1 then
 			vals[k:sub(#prefix + 1)] = tostring(v)
 		end
@@ -88,17 +92,7 @@ function Request.formvaluetable(self, prefix)
 end
 
 function Request.getenv(self, name)
-	return name and self.env[name] or self.env
-end
-
-function Request.getvalue(self, name)
-	local void = self.get[nil]
-	return name and self.get[name] or self.get
-end
-
-function Request.postvalue(self, name)
-	local void = self.post[nil]
-	return name and self.post[name] or self.post
+	return name and self.message.env[name] or self.message.env
 end
 
 function Request.setfilehandler(self, callback)
@@ -212,20 +206,3 @@ end
 
 urldecode = luci.http.protocol.urldecode
 urlencode = luci.http.protocol.urlencode
---[[
-function urldecode(str)
-	str = str:gsub("+", " ")
-	str = str:gsub("%%(%x%x)",
-		function(h) return string.char(tonumber(h,16)) end)
-	str = str:gsub("\r\n", "\n")
-	return str	
-end
-
-function urlencode(str)
-	str = str:gsub("\n", "\r\n")
-	str = str:gsub("([^%w ])",
-		function (c) return string.format ("%%%02X", string.byte(c)) end)
-	str = str:gsub(" ", "+")
-	return str	
-end
-]]--
\ No newline at end of file
diff --git a/libs/web/luasrc/http/protocol.lua b/libs/web/luasrc/http/protocol.lua
index 4ff2cb8f9..d9259f660 100644
--- a/libs/web/luasrc/http/protocol.lua
+++ b/libs/web/luasrc/http/protocol.lua
@@ -370,9 +370,6 @@ function parse_message_header( data )
 
 			message.headers = hdrs
 
-			-- Get content
-			local clen = ( hdrs['Content-Length'] or HTTP_MAX_CONTENT ) + 0
-
 			-- Process get parameters
 			if ( method == "get" or method == "post" ) and
 			   message.request_uri:match("?")
@@ -421,25 +418,24 @@ end
 function parse_message_body( reader, message, filecb )
 
 	if type(message) == "table" then
+		local env = message.env
 
-		local hdrs = message.headers
-
+		local clen = ( env.CONTENT_LENGTH or HTTP_MAX_CONTENT ) + 0
+		
 		-- Process post method
-		if message.request_method == "post" and hdrs['Content-Type'] then
-
+		if env.REQUEST_METHOD:lower() == "post" and env.CONTENT_TYPE then
 			-- Is it multipart/form-data ?
-			if hdrs['Content-Type']:match("^multipart/form%-data") then
+			if env.CONTENT_TYPE:match("^multipart/form%-data") then
 				for k, v in pairs( mimedecode(
 					reader,
-					hdrs['Content-Type']:match("boundary=(.+)"),
+					env.CONTENT_TYPE:match("boundary=(.+)"),
 					filecb
 				) ) do
 					message.params[k] = v
 				end
 
-			-- Is it x-www-urlencoded?
-			elseif hdrs['Content-Type'] == 'application/x-www-urlencoded' then
-
+			-- Is it x-www-form-urlencoded?
+			elseif env.CONTENT_TYPE:match('^application/x%-www%-form%-urlencoded') then
 				-- XXX: readline isn't the best solution here
 				for chunk in reader do
 					for k, v in pairs( urldecode_params( chunk ) ) do
@@ -458,7 +454,6 @@ function parse_message_body( reader, message, filecb )
 			-- If a file callback is given then feed it line by line, else
 			-- store whole buffer in message.content
 			else
-
 				for chunk in reader do
 
 					-- We have a callback, feed it.