web sfaff : improved apache rewrite handler

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index c39c981..872489f 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -795,9 +795,9 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     # is redirected to the index.  This allows us to
     # map multiple routes to the same application.
     RewriteEngine On
-    RewriteCond %{REQUEST_URI} !t_*
-    RewriteCond %{REQUEST_URI} !index
-    RewriteRule (.*) /eg/staff/index [L,DPI]
+    RewriteCond %{PATH_INFO} !/staff/index
+    RewriteCond %{PATH_INFO} !/staff/t_*
+    RewriteRule .* /eg/staff/index [L,DPI]
 </Location>
 
 # Uncomment the following to force SSL for everything. Note that this defeats caching

diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index 8d70ab3..d4ea089 100644 (file)
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -807,9 +807,9 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
     # is redirected to the index.  This allows us to
     # map multiple routes to the same application.
     RewriteEngine On
-    RewriteCond %{REQUEST_URI} !t_*
-    RewriteCond %{REQUEST_URI} !index
-    RewriteRule (.*) /eg/staff/index [L,DPI]
+    RewriteCond %{PATH_INFO} !/staff/index
+    RewriteCond %{PATH_INFO} !/staff/t_*
+    RewriteRule .* /eg/staff/index [L,DPI]
 </Location>