aboutsummaryrefslogtreecommitdiff
path: root/src/url.lua
diff options
context:
space:
mode:
authorDiego Nehab <diego@tecgraf.puc-rio.br>2004-06-16 21:56:23 +0000
committerDiego Nehab <diego@tecgraf.puc-rio.br>2004-06-16 21:56:23 +0000
commit574708380f19b15bd19419bfd64ccbe422f2d924 (patch)
treedeb5030132ca370193d1d64bd57fbcce4c7ce8eb /src/url.lua
parentba2f0b8c6ba7fb3a26fa6d9676ee1aefe6d873cc (diff)
downloadluasocket-574708380f19b15bd19419bfd64ccbe422f2d924.tar.gz
luasocket-574708380f19b15bd19419bfd64ccbe422f2d924.tar.bz2
luasocket-574708380f19b15bd19419bfd64ccbe422f2d924.zip
Simplified HTTP module.
Diffstat (limited to 'src/url.lua')
-rw-r--r--src/url.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/url.lua b/src/url.lua
index 960a248..ec26e62 100644
--- a/src/url.lua
+++ b/src/url.lua
@@ -190,7 +190,7 @@ end
190-- corresponding absolute url 190-- corresponding absolute url
191----------------------------------------------------------------------------- 191-----------------------------------------------------------------------------
192function absolute(base_url, relative_url) 192function absolute(base_url, relative_url)
193 local base = parse(base_url) 193 local base = type(base_url) == "table" and base_url or parse(base_url)
194 local relative = parse(relative_url) 194 local relative = parse(relative_url)
195 if not base then return relative_url 195 if not base then return relative_url
196 elseif not relative then return base_url 196 elseif not relative then return base_url