net.http.server: Don't overwrite existing response.headers when returning a response...

diff --git a/net/http/server.lua b/net/http/server.lua
index 87d82418550489b2e9955abd3a98572ca7008e43..20c2da3e96ab3574652a6d4cbbc2eba3097b76eb 100644 (file)
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -219,7 +219,13 @@ function handle_request(conn, request, finish_cb)
                                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);