prosody
706053e3f9f5
net/http/server.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

net/http/server.lua @ 5420:706053e3f9f5

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 03 Apr 2013 13:53:21 +0100
parent 5404:ae9a47e579d7
child 5439:bd7b314c2301
line wrap: on
line diff
--- a/net/http/server.lua	Sun Mar 31 13:21:19 2013 +0100
+++ b/net/http/server.lua	Wed Apr 03 13:53:21 2013 +0100
@@ -219,7 +219,13 @@
 				body = result;
 			elseif result_type == "table" then
 				for k, v in pairs(result) do
-					response[k] = v;
+					if k ~= "headers" then
+						response[k] = v;
+					else
+						for header_name, header_value in pairs(v) do
+							response.headers[header_name] = header_value;
+						end
+					end
 				end
 			end
 			response:send(body);