diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-24 21:59:20 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-24 21:59:20 +0100 |
| commit | 15175bb828ab14cf0f35b221227beeeb46e4dd8f (patch) | |
| tree | fe8c013599dd847f7365cb1adab80ab8fe846de5 /net/httpserver.lua | |
| parent | a5efef5aab5624e3a1cb4f1966e719738b859eda (diff) | |
| parent | 7cb22f77a78741a1bd085c6b3dc3b31f51c1fa09 (diff) | |
| download | prosody-15175bb828ab14cf0f35b221227beeeb46e4dd8f.tar.gz prosody-15175bb828ab14cf0f35b221227beeeb46e4dd8f.zip | |
Merge timber->trunk - thanks everyone!
Diffstat (limited to 'net/httpserver.lua')
| -rw-r--r-- | net/httpserver.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/httpserver.lua b/net/httpserver.lua index 44e8e24d..0f5a4186 100644 --- a/net/httpserver.lua +++ b/net/httpserver.lua @@ -10,8 +10,8 @@ local url_parse = require "socket.url".parse; local httpstream_new = require "util.httpstream".new; -local connlisteners_start = require "net.connlisteners".start; -local connlisteners_get = require "net.connlisteners".get; +--local connlisteners_start = require "net.connlisteners".start; +--local connlisteners_get = require "net.connlisteners".get; local listener; local t_insert, t_concat = table.insert, table.concat; @@ -164,7 +164,7 @@ end function destroy_request(request) log("debug", "Destroying request %s", request.id); - listener = listener or connlisteners_get("httpserver"); + --listener = listener or connlisteners_get("httpserver"); if not request.destroyed then request.destroyed = true; if request.on_destroy then @@ -186,7 +186,7 @@ function new(params) http_server = { handlers = {} }; http_servers[params.port] = http_server; -- We weren't already listening on this port, so start now - connlisteners_start("httpserver", params); + --connlisteners_start("httpserver", params); end if params.base then http_server.handlers[params.base] = params.handler; |