X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fluci-base%2Fluasrc%2Fhttp%2Fprotocol.lua;h=0cb62aeec9dc60f909c181de2c8ea482db2d0a07;hb=23df4ffaf7060fd10e6b3f41ada903d52a55ad03;hp=61d7b802fe87c2dbe4f6276a6dcd78893e35ed93;hpb=4ab6dcea9b7111a23ac6c3bc8d14cfb93a7a52ff;p=project%2Fluci.git

diff --git a/modules/luci-base/luasrc/http/protocol.lua b/modules/luci-base/luasrc/http/protocol.lua
index 61d7b802f..0cb62aeec 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
@@ -559,14 +559,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