From: Karl Palsson <karlp@remake.is>
Date: Tue, 18 Aug 2015 13:59:32 +0000 (+0000)
Subject: http.protocol: Support filehandlers for unhandled encodings
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=22f687d0b13b91c94de304eb66021a00c847e698;p=oweals%2Fluci.git

http.protocol: Support filehandlers for unhandled encodings

The setfilehandler() functions used for mime and url encoded message
bodies all operate with a signature of fh(meta, chunk, eof), but for
unhandled encodings, the callback was directly assigned to the sink
function, which has a signature of snk(chunk).  Insert a wrapper to
properly generate the EOF flag, and include a stub "meta" block
providing a virtual "name" and also the original client provided
Content-Type header, to possibly help with taking alternative actions in
the file handler.

The sink function created for raw content decoding also used the wrong
signature for the sink function.

Signed-off-by: Karl Palsson <karlp@remake.is>
---

diff --git a/modules/luci-base/luasrc/http/protocol.lua b/modules/luci-base/luasrc/http/protocol.lua
index 61d7b802f..859272679 100644
--- a/modules/luci-base/luasrc/http/protocol.lua
+++ b/modules/luci-base/luasrc/http/protocol.lua
@@ -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