webmcp
changeset 280:5af7c66fbc08
Use "./" instead of "" as relative baseurl
author | jbe |
---|---|
date | Sat Mar 21 19:26:34 2015 +0100 (2015-03-21) |
parents | 680777af0293 |
children | e5c9319b28f9 |
files | framework/env/request/__init.lua framework/env/request/handler.lua |
line diff
1.1 --- a/framework/env/request/__init.lua Sat Mar 21 18:56:44 2015 +0100 1.2 +++ b/framework/env/request/__init.lua Sat Mar 21 19:26:34 2015 +0100 1.3 @@ -26,6 +26,7 @@ 1.4 request._404_route = nil 1.5 1.6 -- non-configurable 1.7 + request._relative_baseurl = nil 1.8 request._http_request = nil 1.9 request._status = nil 1.10 request._forward = nil
2.1 --- a/framework/env/request/handler.lua Sat Mar 21 18:56:44 2015 +0100 2.2 +++ b/framework/env/request/handler.lua Sat Mar 21 19:26:34 2015 +0100 2.3 @@ -34,7 +34,11 @@ 2.4 for match in string.gmatch(path, "/") do 2.5 relative_baseurl_elements[#relative_baseurl_elements+1] = "../" 2.6 end 2.7 - request._relative_baseurl = table.concat(relative_baseurl_elements) 2.8 + if #relative_baseurl_elements > 0 then 2.9 + request._relative_baseurl = table.concat(relative_baseurl_elements) 2.10 + else 2.11 + request._relative_baseurl = "./" 2.12 + end 2.13 else 2.14 request._relative_baseurl = nil 2.15 end