# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1364733904 -3600
# Node ID ae9a47e579d7aef9acc2e98e53daf32b721056ed
# Parent  d7ecf6cd584eed384ced17e640bdec0393dc6fca
net.http.server: Don't overwrite existing response.headers when returning a response object from a HTTP handler (waqas says it's wrong)

diff -r d7ecf6cd584e -r ae9a47e579d7 net/http/server.lua
--- a/net/http/server.lua	Sun Mar 31 13:43:12 2013 +0100
+++ b/net/http/server.lua	Sun Mar 31 13:45:04 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);