aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_httpserver.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-09-24 11:16:25 +0100
committerMatthew Wild <mwild1@gmail.com>2009-09-24 11:16:25 +0100
commit801957dc9674d71b01f56e37d15ac6ae12134588 (patch)
tree55b3940b2a750f2941e98376709b21663aa97dd3 /plugins/mod_httpserver.lua
parent68cbd6d4b0d8673edc08d42d61ab6c6603470c36 (diff)
parente0c4e19bab9f19717c626bba804f2421823d2be7 (diff)
downloadprosody-801957dc9674d71b01f56e37d15ac6ae12134588.tar.gz
prosody-801957dc9674d71b01f56e37d15ac6ae12134588.zip
Merge with 0.5
Diffstat (limited to 'plugins/mod_httpserver.lua')
-rw-r--r--plugins/mod_httpserver.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua
index f1f2150d..72a4506a 100644
--- a/plugins/mod_httpserver.lua
+++ b/plugins/mod_httpserver.lua
@@ -12,7 +12,7 @@ local httpserver = require "net.httpserver";
local open = io.open;
local t_concat = table.concat;
-local http_base = "www_files";
+local http_base = config.get("*", "core", "http_path") or "www_files";
local response_400 = { status = "400 Bad Request", body = "<h1>Bad Request</h1>Sorry, we didn't understand your request :(" };
local response_404 = { status = "404 Not Found", body = "<h1>Page Not Found</h1>Sorry, we couldn't find what you were looking for :(" };