Software / code / prosody
Diff
net/httpserver.lua @ 4684:dc70c4ffb66d
Merge timber->trunk - thanks everyone!
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Apr 2012 21:59:20 +0100 |
| parent | 4658:de04897cb8fe |
line wrap: on
line diff
--- a/net/httpserver.lua Tue Apr 24 03:23:44 2012 +0100 +++ b/net/httpserver.lua Tue Apr 24 21:59:20 2012 +0100 @@ -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 @@ 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 @@ 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;
