From e48d1402c6567984f02f41a52854eab0ebba0c48 Mon Sep 17 00:00:00 2001 From: David Cook Date: Thu, 25 May 2017 14:37:21 +1000 Subject: [PATCH] [SIGNED-OFF] Bug 18669 - RewriteCond affecting wrong rule in koha-httpd.conf One of the RewriteCond directives in koha-httpd.conf was affecting the wrong RewriteRule after its original RewriteRule was commented out years ago. _TEST PLAN_ 0) Before applying patch, build Koha from source *) make *) make install (or make upgrade) *) Copy or symlink etc/koha-httpd.conf to your Apache vhost directory (and enable if you're on a Debian based system) *) Restart Apache 1) Make sure that you have at least 1 bibliographic record in Koha (URL like this http://server:port/cgi-bin/koha/opac-detail.pl?biblionumber=1) 2) Go to http://server:port/bib/1 3) Note that you get a 404 error 4) Apply the patch 5) Rebuild Koha from source as per step 0 6) Go to http://server:port/bib/1 7) Note that you now see the same page as you would if you went to http://server:port/cgi-bin/koha/opac-detail.pl?biblionumber=1 Signed-off-by: Josef Moravec --- etc/koha-httpd.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf index 2747791..c3b55a4 100644 --- a/etc/koha-httpd.conf +++ b/etc/koha-httpd.conf @@ -105,7 +105,8 @@ #RewriteLog __LOG_DIR__/koha-opac-rewrite.log #RewriteLogLevel 1 - RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*) + #The following two directives are unnecessary to proper Koha functioning. + #RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*) #RewriteRule (.+) $1?%1%2 [N,R,NE] RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT] RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT] @@ -221,7 +222,8 @@ #RewriteLog __LOG_DIR__/koha-intranet-rewrite.log #RewriteLogLevel 1 - RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*) + #The following two directives are unnecessary to proper Koha functioning. + #RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*) #RewriteRule (.+) $1?%1%2 [N,R,NE] RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/detail\.pl?bib=$1 [PT] RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT] -- 2.1.4