From 2778766d678b147fc079d67dee036346381b4764 Mon Sep 17 00:00:00 2001
From: Diego Nehab <diego@tecgraf.puc-rio.br>
Date: Wed, 11 Apr 2012 13:21:25 -0700
Subject: Preliminary IPv6 support for v2.1

---
 src/url.lua | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/url.lua')

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 @@
 -- URI parsing, composition and relative URL resolution
 -- LuaSocket toolkit.
 -- Author: Diego Nehab
--- RCS ID: $Id$
+-- RCS ID: $Id: url.lua,v 1.38 2006/04/03 04:45:42 diego Exp $
 -----------------------------------------------------------------------------
 
 -----------------------------------------------------------------------------
@@ -195,13 +195,7 @@ function build(parsed)
         end
         if userinfo then authority = userinfo .. "@" .. authority end
     end
-    if authority then 
-        if string.sub(url, 1, 1) == "/" then
-            url = "//" .. authority .. url 
-        else
-            url = "//" .. authority .. "/" .. url 
-        end
-    end
+    if authority then url = "//" .. authority .. url end
     if parsed.scheme then url = parsed.scheme .. ":" .. url end
     if parsed.fragment then url = url .. "#" .. parsed.fragment end
     -- url = string.gsub(url, "%s", "")
@@ -217,8 +211,8 @@ end
 --   corresponding absolute url
 -----------------------------------------------------------------------------
 function absolute(base_url, relative_url)
-    local base_parsed = base_url
     if base.type(base_url) == "table" then
+        base_parsed = base_url
         base_url = build(base_parsed)
     else
         base_parsed = parse(base_url)
-- 
cgit v1.2.3-55-g6feb