projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s2smanager: More whitespace
[prosody.git]
/
net
/
httpserver.lua
diff --git
a/net/httpserver.lua
b/net/httpserver.lua
index 654025bab145190caca2f7f7678c2b9e9dd7679b..6273bbb9ce690669f37a03848fdc85c2ad72e5d6 100644
(file)
--- a/
net/httpserver.lua
+++ b/
net/httpserver.lua
@@
-23,9
+23,6
@@
local urlencode = function (s) return s and (s:gsub("%W", function (c) return st
local log = require "util.logger".init("httpserver");
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"
local http_servers = {};
module "httpserver"
@@
-68,9
+65,7
@@
local function send_response(request, response)
resp = { "HTTP/1.0 200 OK\r\n" };
t_insert(resp, "Connection: close\r\n");
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-Type: text/html\r\n");
t_insert(resp, "Content-Length: ");
t_insert(resp, #response);
t_insert(resp, "\r\n\r\n");
t_insert(resp, "Content-Length: ");
t_insert(resp, #response);
t_insert(resp, "\r\n\r\n");
@@
-188,7
+183,7
@@
local function request_reader(request, data, startpos)
request.url = url_parse(request.path);
request.url = url_parse(request.path);
- log("debug", method.." request for "..tostring(request.path) .. " on port "..request.handler
.
serverport());
+ log("debug", method.." request for "..tostring(request.path) .. " on port "..request.handler
:
serverport());
if request.onlystatus then
if not call_callback(request) then
if request.onlystatus then
if not call_callback(request) then
@@
-206,7
+201,7
@@
end
-- The default handler for requests
default_handler = function (method, body, request)
-- The default handler for requests
default_handler = function (method, body, request)
- log("debug", method.." request for "..tostring(request.path) .. " on port "..request.handler
.
serverport());
+ log("debug", method.." request for "..tostring(request.path) .. " on port "..request.handler
:
serverport());
return { status = "404 Not Found",
headers = { ["Content-Type"] = "text/html" },
body = "<html><head><title>Page Not Found</title></head><body>Not here :(</body></html>" };
return { status = "404 Not Found",
headers = { ["Content-Type"] = "text/html" },
body = "<html><head><title>Page Not Found</title></head><body>Not here :(</body></html>" };
@@
-234,7
+229,7
@@
function destroy_request(request)
else
log("debug", "Request has no destroy callback");
end
else
log("debug", "Request has no destroy callback");
end
- request.handler
.
close()
+ request.handler
:
close()
if request.conn then
listener.ondisconnect(request.handler, "closed");
end
if request.conn then
listener.ondisconnect(request.handler, "closed");
end
@@
-282,6
+277,7
@@
function new_from_config(ports, handle_request, default_options)
if ssl then
ssl.mode = "server";
ssl.protocol = "sslv23";
if ssl then
ssl.mode = "server";
ssl.protocol = "sslv23";
+ ssl.options = "no_sslv2";
end
new{ port = port, interface = interface,
end
new{ port = port, interface = interface,