aboutsummaryrefslogtreecommitdiff
path: root/src/url.lua
diff options
context:
space:
mode:
Diffstat (limited to 'src/url.lua')
-rw-r--r--src/url.lua12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/url.lua b/src/url.lua
index 7623557..2158796 100644
--- a/src/url.lua
+++ b/src/url.lua
@@ -2,7 +2,7 @@
2-- URI parsing, composition and relative URL resolution 2-- URI parsing, composition and relative URL resolution
3-- LuaSocket toolkit. 3-- LuaSocket toolkit.
4-- Author: Diego Nehab 4-- Author: Diego Nehab
5-- RCS ID: $Id$ 5-- RCS ID: $Id: url.lua,v 1.38 2006/04/03 04:45:42 diego Exp $
6----------------------------------------------------------------------------- 6-----------------------------------------------------------------------------
7 7
8----------------------------------------------------------------------------- 8-----------------------------------------------------------------------------
@@ -195,13 +195,7 @@ function build(parsed)
195 end 195 end
196 if userinfo then authority = userinfo .. "@" .. authority end 196 if userinfo then authority = userinfo .. "@" .. authority end
197 end 197 end
198 if authority then 198 if authority then url = "//" .. authority .. url end
199 if string.sub(url, 1, 1) == "/" then
200 url = "//" .. authority .. url
201 else
202 url = "//" .. authority .. "/" .. url
203 end
204 end
205 if parsed.scheme then url = parsed.scheme .. ":" .. url end 199 if parsed.scheme then url = parsed.scheme .. ":" .. url end
206 if parsed.fragment then url = url .. "#" .. parsed.fragment end 200 if parsed.fragment then url = url .. "#" .. parsed.fragment end
207 -- url = string.gsub(url, "%s", "") 201 -- url = string.gsub(url, "%s", "")
@@ -217,8 +211,8 @@ end
217-- corresponding absolute url 211-- corresponding absolute url
218----------------------------------------------------------------------------- 212-----------------------------------------------------------------------------
219function absolute(base_url, relative_url) 213function absolute(base_url, relative_url)
220 local base_parsed = base_url
221 if base.type(base_url) == "table" then 214 if base.type(base_url) == "table" then
215 base_parsed = base_url
222 base_url = build(base_parsed) 216 base_url = build(base_parsed)
223 else 217 else
224 base_parsed = parse(base_url) 218 base_parsed = parse(base_url)