diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-07-14 21:04:57 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-07-14 21:04:57 +0100 |
| commit | 086283ad1d3474993527d7689ac1fb5423aada9b (patch) | |
| tree | b284c4b4091fa23a34f7fecd8fb6582a44ea8451 /plugins | |
| parent | fed4a58f4e364a5901420285dcc13397467027a1 (diff) | |
| parent | 40f2dda03d4459ebd4e0928e3a671a4024c23b7a (diff) | |
| download | prosody-086283ad1d3474993527d7689ac1fb5423aada9b.tar.gz prosody-086283ad1d3474993527d7689ac1fb5423aada9b.zip | |
Merge with 0.5
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_bosh.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_httpserver.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index fdda206b..744893c4 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -276,6 +276,6 @@ function on_timer() end local ports = config.get(module.host, "core", "bosh_ports") or { 5280 }; -httpserver.new_from_config(ports, handle_request); +httpserver.new_from_config(ports, "http-bind", handle_request); server.addtimer(on_timer); diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua index 0f1d991c..a8639281 100644 --- a/plugins/mod_httpserver.lua +++ b/plugins/mod_httpserver.lua @@ -28,4 +28,4 @@ local function handle_request(method, body, request) end local ports = config.get(module.host, "core", "http_ports") or { 5280 }; -httpserver.new_from_config(ports, handle_request); +httpserver.new_from_config(ports, "files", handle_request); |