X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-base%2Fluasrc%2Fhttp%2Fprotocol.lua;h=0a8b2fbab95e5058252d734e021733b4f3eb71a6;hp=e9efb44cfa65bf08f93b56f11470dbe6dcb1318b;hb=7fd4f84aa95e81c4b021498f57d8b57c8cc20db5;hpb=84346cd178ca0740817edc6f81d8f90e7bc6e00c

diff --git a/modules/luci-base/luasrc/http/protocol.lua b/modules/luci-base/luasrc/http/protocol.lua
index e9efb44cf..0a8b2fbab 100644
--- a/modules/luci-base/luasrc/http/protocol.lua
+++ b/modules/luci-base/luasrc/http/protocol.lua
@@ -72,7 +72,7 @@ function urlencode( str )
 
 	if type(str) == "string" then
 		str = str:gsub(
-			"([^a-zA-Z0-9$_%-%.%+!*'(),])",
+			"([^a-zA-Z0-9$_%-%.%~])",
 			__chrenc
 		)
 	end
@@ -114,6 +114,16 @@ local function __initval( tbl, key )
 end
 
 -- (Internal function)
+-- Initialize given file parameter.
+local function __initfileval( tbl, key, filename, fd )
+	if tbl[key] == nil then
+		tbl[key] = { file=filename, fd=fd, name=key, "" }
+	else
+		table.insert( tbl[key], "" )
+	end
+end
+
+-- (Internal function)
 -- Append given data to given parameter, either by extending the string value
 -- or by appending it to the last string in the parameter's value table.
 local function __appendval( tbl, key, chunk )
@@ -254,7 +264,7 @@ function header_source( sock )
 end
 
 -- Content-Type. Stores all extracted data associated with its parameter name
--- in the params table withing the given message object. Multiple parameter
+-- in the params table within the given message object. Multiple parameter
 -- values are stored as tables, ordinary ones as strings.
 -- If an optional file callback function is given then it is feeded with the
 -- file contents chunk by chunk and only the extracted file name is stored
@@ -313,6 +323,22 @@ function mimedecode_message_body( src, msg, filecb )
 				__appendval( msg.params, field.name, field.file )
 
 				store = filecb
+			elseif field.name and field.file then
+				local nxf = require "nixio"
+				local fd = nxf.mkstemp(field.name)
+				__initfileval ( msg.params, field.name, field.file, fd )
+				if fd then
+					store = function(hdr, buf, eof)
+						fd:write(buf)
+						if (eof) then
+							fd:seek(0, "set")
+						end
+					end
+				else
+					store = function( hdr, buf, eof )
+						__appendval( msg.params, field.name, buf )
+					end
+				end
 			elseif field.name then
 				__initval( msg.params, field.name )
 
@@ -407,7 +433,7 @@ function mimedecode_message_body( src, msg, filecb )
 end
 
 -- Content-Type. Stores all extracted data associated with its parameter name
--- in the params table withing the given message object. Multiple parameter
+-- in the params table within the given message object. Multiple parameter
 -- values are stored as tables, ordinary ones as strings.
 function urldecode_message_body( src, msg )
 
@@ -559,14 +585,23 @@ function parse_message_body( src, msg, filecb )
 
 		-- If we have a file callback then feed it
 		if type(filecb) == "function" then
-			sink = filecb
-
+			local meta = {
+				name = "raw",
+				encoding = msg.env.CONTENT_TYPE
+			}
+			sink = function( chunk )
+				if chunk then
+					return filecb(meta, chunk, false)
+				else
+					return filecb(meta, nil, true)
+				end
+			end
 		-- ... else append to .content
 		else
 			msg.content = ""
 			msg.content_length = 0
 
-			sink = function( chunk, err )
+			sink = function( chunk )
 				if chunk then
 					if ( msg.content_length + #chunk ) <= HTTP_MAX_CONTENT then
 						msg.content        = msg.content        .. chunk