Saving before big changes to support IPv6.

1 files changed, 64 insertions, 58 deletions

diff --git a/src/url.lua b/src/url.lua
index 18e5ab2..7623557 100644
--- a/src/url.lua
+++ b/src/url.lua
@@ -40,25 +40,25 @@ end
 --   escaped representation of string binary
 -----------------------------------------------------------------------------
 local function make_set(t)
-        local s = {}
-        for i,v in base.ipairs(t) do
-                s[t[i]] = 1
-        end
-        return s
+    local s = {}
+    for i,v in base.ipairs(t) do
+        s[t[i]] = 1
+    end
+    return s
 end
 
 -- these are allowed withing a path segment, along with alphanum
 -- other characters must be escaped
 local segment_set = make_set {
     "-", "_", ".", "!", "~", "*", "'", "(",
-        ")", ":", "@", "&", "=", "+", "$", ",",
+    ")", ":", "@", "&", "=", "+", "$", ",",
 }
 
 local function protect_segment(s)
-        return string.gsub(s, "([^A-Za-z0-9_])", function (c)
-                if segment_set[c] then return c
-                else return string.format("%%%02x", string.byte(c)) end
-        end)
+    return string.gsub(s, "([^A-Za-z0-9_])", function (c)
+        if segment_set[c] then return c
+        else return string.format("%%%02x", string.byte(c)) end
+    end)
 end
 
 -----------------------------------------------------------------------------
@@ -182,20 +182,26 @@ function build(parsed)
     local url = build_path(ppath)
     if parsed.params then url = url .. ";" .. parsed.params end
     if parsed.query then url = url .. "?" .. parsed.query end
-        local authority = parsed.authority
-        if parsed.host then
-                authority = parsed.host
-                if parsed.port then authority = authority .. ":" .. parsed.port end
-                local userinfo = parsed.userinfo
-                if parsed.user then
-                        userinfo = parsed.user
-                        if parsed.password then
-                                userinfo = userinfo .. ":" .. parsed.password
-                        end
-                end
-                if userinfo then authority = userinfo .. "@" .. authority end
-        end
-    if authority then url = "//" .. authority .. url end
+    local authority = parsed.authority
+    if parsed.host then
+        authority = parsed.host
+        if parsed.port then authority = authority .. ":" .. parsed.port end
+        local userinfo = parsed.userinfo
+        if parsed.user then
+            userinfo = parsed.user
+            if parsed.password then
+                userinfo = userinfo .. ":" .. parsed.password
+            end
+        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 parsed.scheme then url = parsed.scheme .. ":" .. url end
     if parsed.fragment then url = url .. "#" .. parsed.fragment end
     -- url = string.gsub(url, "%s", "")
@@ -211,8 +217,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)
@@ -250,16 +256,16 @@ end
 --   segment: a table with one entry per segment
 -----------------------------------------------------------------------------
 function parse_path(path)
-        local parsed = {}
-        path = path or ""
-        --path = string.gsub(path, "%s", "")
-        string.gsub(path, "([^/]+)", function (s) table.insert(parsed, s) end)
-        for i = 1, table.getn(parsed) do
-                parsed[i] = unescape(parsed[i])
-        end
-        if string.sub(path, 1, 1) == "/" then parsed.is_absolute = 1 end
-        if string.sub(path, -1, -1) == "/" then parsed.is_directory = 1 end
-        return parsed
+    local parsed = {}
+    path = path or ""
+    --path = string.gsub(path, "%s", "")
+    string.gsub(path, "([^/]+)", function (s) table.insert(parsed, s) end)
+    for i = 1, table.getn(parsed) do
+        parsed[i] = unescape(parsed[i])
+    end
+    if string.sub(path, 1, 1) == "/" then parsed.is_absolute = 1 end
+    if string.sub(path, -1, -1) == "/" then parsed.is_directory = 1 end
+    return parsed
 end
 
 -----------------------------------------------------------------------------
@@ -271,27 +277,27 @@ end
 --   path: corresponding path stringing
 -----------------------------------------------------------------------------
 function build_path(parsed, unsafe)
-        local path = ""
-        local n = table.getn(parsed)
-        if unsafe then
-                for i = 1, n-1 do
-                        path = path .. parsed[i]
-                        path = path .. "/"
-                end
-                if n > 0 then
-                        path = path .. parsed[n]
-                        if parsed.is_directory then path = path .. "/" end
-                end
-        else
-                for i = 1, n-1 do
-                        path = path .. protect_segment(parsed[i])
-                        path = path .. "/"
-                end
-                if n > 0 then
-                        path = path .. protect_segment(parsed[n])
-                        if parsed.is_directory then path = path .. "/" end
-                end
-        end
-        if parsed.is_absolute then path = "/" .. path end
-        return path
+    local path = ""
+    local n = table.getn(parsed)
+    if unsafe then
+        for i = 1, n-1 do
+            path = path .. parsed[i]
+            path = path .. "/"
+        end
+        if n > 0 then
+            path = path .. parsed[n]
+            if parsed.is_directory then path = path .. "/" end
+        end
+    else
+        for i = 1, n-1 do
+            path = path .. protect_segment(parsed[i])
+            path = path .. "/"
+        end
+        if n > 0 then
+            path = path .. protect_segment(parsed[n])
+            if parsed.is_directory then path = path .. "/" end
+        end
+    end
+    if parsed.is_absolute then path = "/" .. path end
+    return path
 end