From b72988299f46dcceb4ae87c7cfb77b89ebb58dae Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 13 Mar 2016 14:28:23 +0100
Subject: [PATCH] routing, fix request query parsing

---
 src/etc/inc/system.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index a680c6a27..b3ed9da44 100644
--- 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;