* luci/libs: make treatment of "+" conditional in http.protocol ("+" should not be decoded by urldecode)

* luci/https:	fix breakage introduced by "+" decoding

1 files changed, 5 insertions, 2 deletions

diff --git a/libs/http/luasrc/http/protocol.lua b/libs/http/luasrc/http/protocol.lua
index a187bed2e..b8e962449 100644
--- a/libs/http/luasrc/http/protocol.lua
+++ b/libs/http/luasrc/http/protocol.lua
@@ -23,14 +23,17 @@ HTTP_URLENC_MAXKEYLEN = 1024		-- maximum allowd size of urlencoded parameter nam
 
 -- Decode an urlencoded string.
 -- Returns the decoded value.
-function urldecode( str )
+function urldecode( str, no_plus )
 
 	local function __chrdec( hex )
 		return string.char( tonumber( hex, 16 ) )
 	end
 
 	if type(str) == "string" then
-		str = str:gsub( "+", " " )
+		if not no_plus then
+			str = str:gsub( "+", " " )
+		end
+
 		str = str:gsub( "%%([a-fA-F0-9][a-fA-F0-9])", __chrdec )
 	end