projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with waqas
[prosody.git]
/
net
/
httpserver.lua
diff --git
a/net/httpserver.lua
b/net/httpserver.lua
index 77cc5b981ad5a5016767401f3013fa3b6ba5c0f6..699e0324dfcb35565fd5a3e46bd3ad6c61421292 100644
(file)
--- a/
net/httpserver.lua
+++ b/
net/httpserver.lua
@@
-105,7
+105,7
@@
local function call_callback(request, err)
if response then
if response == true and not request.destroyed then
-- Keep connection open, we will reply later
if response then
if response == true and not request.destroyed then
-- Keep connection open, we will reply later
- log("
warn
", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
+ log("
debug
", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
elseif response ~= true then
-- Assume response
send_response(request, response);
elseif response ~= true then
-- Assume response
send_response(request, response);
@@
-250,13
+250,13
@@
function new(params)
end
end
end
end
-function new_from_config(ports, handle_request)
+function new_from_config(ports,
default_base,
handle_request)
for _, options in ipairs(ports) do
for _, options in ipairs(ports) do
- local port, base, ssl, interface = 5280,
"http-bind"
, false, nil;
+ local port, base, ssl, interface = 5280,
default_base
, false, nil;
if type(options) == "number" then
port = options;
elseif type(options) == "table" then
if type(options) == "number" then
port = options;
elseif type(options) == "table" then
- port, base, ssl, interface = options.port or 5280, options.path or
"http-bind"
, options.ssl or false, options.interface;
+ port, base, ssl, interface = options.port or 5280, options.path or
default_base
, options.ssl or false, options.interface;
elseif type(options) == "string" then
base = options;
end
elseif type(options) == "string" then
base = options;
end