Fixed WSF_REQUEST.script_url (..) for clean path

Added related autotests
This commit is contained in:
Jocelyn Fiat
2012-01-19 10:25:53 +01:00
parent 4cf3393a13
commit 1b55b09b64
11 changed files with 399 additions and 5 deletions

View File

@@ -1202,7 +1202,7 @@ feature -- URL Utility
-- Url relative to script name if any, extended by `a_path'
local
l_base_url: like internal_url_base
i,m,n: INTEGER
i,m,n,spos: INTEGER
l_rq_uri: like request_uri
do
l_base_url := internal_url_base
@@ -1220,13 +1220,23 @@ feature -- URL Utility
until
i > m or i > n or l_rq_uri[i] /= l_script_name[i]
loop
if l_rq_uri[i] = '/' then
spos := i
end
i := i + 1
end
if i > 1 then
if l_rq_uri[i-1] = '/' then
i := i -1
elseif spos > 0 then
i := spos
end
spos := l_rq_uri.substring_index (path_info, i)
if spos > 0 then
l_base_url := l_rq_uri.substring (1, spos - 1)
else
l_base_url := l_rq_uri.substring (1, i - 1)
end
l_base_url := l_rq_uri.substring (1, i - 1)
end
end
end