Changeset 6421

Timestamp:

11/13/10 14:52:34 (3 years ago)

Author:

jow

Message:

luci-0.9: merge r6420

Files:

• luci/branches/luci-0.9/libs/web/luasrc/dispatcher.lua (modified) (2 diffs)

luci/branches/luci-0.9/libs/web/luasrc/dispatcher.lua

@@ -50 +50 @@
 function build_url(...)
     local path = {...}
-    local sn = http.getenv("SCRIPT_NAME") or ""
+    local url = { http.getenv("SCRIPT_NAME") or "" }
+
+    local k, v
     for k, v in pairs(context.urltoken) do
-        sn = sn .. "/;" .. k .. "=" .. http.urlencode(v)
-    end
-    return sn .. ((#path > 0) and "/" .. table.concat(path, "/") or "")
+        url[#url+1] = "/;"
+        url[#url+1] = http.urlencode(k)
+        url[#url+1] = "="
+        url[#url+1] = http.urlencode(v)
+    end
+
+    local p
+    for _, p in ipairs(path) do
+        if p:match("^[a-zA-Z0-9_%-%./,;]+$") then
+            url[#url+1] = "/"
+            url[#url+1] = p
+        end
+    end
+
+    return table.concat(url, "")
 end
 
@@ -179 +193 @@
         local tkey, tval
         if t then
-            tkey, tval = s:match(";(%w+)=(.*)")
+            tkey, tval = s:match(";(%w+)=([a-fA-F0-9]*)")
         end