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 f471781a93c8b3b3f5c61118f0bf2fa82a6c01f7..b7cd84614886e29a64371e71dbd0ff80af2950f9 100644 (file)
--- 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 cd33caff9b5ef95dd1c335a57293484d405eb719..ad485889014bc5f9d1ce89856743f903715bb078 100644 (file)
--- 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 c0af90b00c07b94f93203920823cc425bdcf834b..bd3a1c6a353d2fa06c6734579f576c3261a8fa0d 100644 (file)
--- 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