routing, fix request query parsing

(cherry picked from commit b7298829)

routing, fix request query parsing
(cherry picked from commit b7298829)
484c2001 · Ad Schellevis · Franco Fichtner · 600b583d · 484c2001
Commit 484c2001 authored Mar 13, 2016 by Ad Schellevis Committed by Franco Fichtner Mar 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

system.inc src/etc/inc/system.inc +2 -2

No files found.
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1068,8 +1068,8 @@ function system_generate_lighty_config(
 # Phalcon ui and api routing
 alias.url += ( "/ui/" => "/usr/local/opnsense/www/" )
 alias.url += ( "/api/"  => "/usr/local/opnsense/www/" )
-url.rewrite-if-not-file = ( "^/ui/(.*)$" => "/ui/index.php?_url=/$1" ,
-                            "^/api/(.*)$" => "/api/api.php?_url=/$1"
+url.rewrite-if-not-file = ( "^/ui/([^\?]+)(\?(.*))?" => "/ui/index.php?_url=/$1&$3" ,
+                            "^/api/([^\?]+)(\?(.*))?" => "/api/api.php?_url=/$1&$3"
 )

 EOD;