From: Jo-Philipp Wich Date: Tue, 23 Mar 2010 16:23:03 +0000 (+0000) Subject: luci-0.9: merge r5655 X-Git-Tag: 0.9.0~39 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e235c7cc60e009fb16f67af096e5c5231f8f905a;p=oweals%2Fluci.git luci-0.9: merge r5655 --- diff --git a/libs/lucid-http/luasrc/lucid/http/DirectoryPublisher.lua b/libs/lucid-http/luasrc/lucid/http/DirectoryPublisher.lua index f471781a9..b7cd84614 100644 --- a/libs/lucid-http/luasrc/lucid/http/DirectoryPublisher.lua +++ b/libs/lucid-http/luasrc/lucid/http/DirectoryPublisher.lua @@ -42,6 +42,6 @@ function factory(server, config) vhost:set_handler(v, handler) end else - vhost:set_handler(config.virtual, handler) + vhost:set_handler(config.virtual or "", handler) end -end \ No newline at end of file +end diff --git a/libs/lucid-http/luasrc/lucid/http/LuciWebPublisher.lua b/libs/lucid-http/luasrc/lucid/http/LuciWebPublisher.lua index cd33caff9..ad4858890 100644 --- a/libs/lucid-http/luasrc/lucid/http/LuciWebPublisher.lua +++ b/libs/lucid-http/luasrc/lucid/http/LuciWebPublisher.lua @@ -60,10 +60,10 @@ function factory(server, config) end else mypath = config.virtual - vhost:set_handler(config.virtual, handler) + vhost:set_handler(config.virtual or "", handler) end if config.home then vhost.default = mypath end -end \ No newline at end of file +end diff --git a/libs/lucid-http/luasrc/lucid/http/Redirector.lua b/libs/lucid-http/luasrc/lucid/http/Redirector.lua index c0af90b00..bd3a1c6a3 100644 --- a/libs/lucid-http/luasrc/lucid/http/Redirector.lua +++ b/libs/lucid-http/luasrc/lucid/http/Redirector.lua @@ -27,5 +27,5 @@ function factory(server, config) end local handler = catchall.Redirect(config.name, config.physical) - vhost:set_handler(config.virtual, handler) -end \ No newline at end of file + vhost:set_handler(config.virtual or "", handler) +end