lucid: fix separation of query string and url in server handler

[project/luci.git] / libs / lucid-http / luasrc / lucid / http / server.lua

diff --git a/libs/lucid-http/luasrc/lucid/http/server.lua b/libs/lucid-http/luasrc/lucid/http/server.lua
index 21a752c..70a1726 100644 (file)
--- a/libs/lucid-http/luasrc/lucid/http/server.lua
+++ b/libs/lucid-http/luasrc/lucid/http/server.lua
@@ -343,8 +343,13 @@ function Server.parse_headers(self, source)
                        break
                end
        until false
-       
-       env.SCRIPT_NAME, env.QUERY_STRING = env.REQUEST_URI:match("(.*)%??(.*)")
+
+       if env.REQUEST_URI:find("?") then       
+               env.SCRIPT_NAME, env.QUERY_STRING = env.REQUEST_URI:match("([^%?]*)%?(.*)")
+       else
+               env.SCRIPT_NAME, env.QUERY_STRING = env.REQUEST_URI, nil
+       end
+
        return req
 end