util.pposix: Fix return type of lc_abort to shush compiler warning

[prosody.git] / net / httpserver.lua

diff --git a/net/httpserver.lua b/net/httpserver.lua
index ddb4475c2dc8d7e5d486e0b0a34d3f0bd2f2324d..654025bab145190caca2f7f7678c2b9e9dd7679b 100644 (file)
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -23,6 +23,9 @@ local urlencode = function (s) return s and (s:gsub("%W", function (c) return st
 
 local log = require "util.logger".init("httpserver");
 
+-- TODO: Should we read this from /etc/mime.types if it exists? (startup time...?)
+local mime_map = { html = "text/html", txt = "plain/text; charset=utf-8", js = "text/javascript" };
+
 local http_servers = {};
 
 module "httpserver"
@@ -65,6 +68,9 @@ local function send_response(request, response)
                
                resp = { "HTTP/1.0 200 OK\r\n" };
                t_insert(resp, "Connection: close\r\n");
+               t_insert(resp, "Content-Type: ");
+               t_insert(resp, mime_map[request.url.path:match("%.(%w+)")] or "application/octet-stream");
+               t_insert(resp, "\r\n");
                t_insert(resp, "Content-Length: ");
                t_insert(resp, #response);
                t_insert(resp, "\r\n\r\n");
@@ -209,8 +215,8 @@ end
 
 function new_request(handler)
        return { handler = handler, conn = handler.socket, 
-                       write = handler.write, state = "request", 
-                       server = http_servers[handler.serverport()],
+                       write = function (...) return handler:write(...); end, state = "request", 
+                       server = http_servers[handler:serverport()],
                        send = send_response,
                        destroy = destroy_request,
                        id = tostring{}:match("%x+$")
@@ -230,7 +236,7 @@ function destroy_request(request)
                end
                request.handler.close()
                if request.conn then
-                       listener.disconnect(request.handler, "closed");
+                       listener.ondisconnect(request.handler, "closed");
                end
        end
 end