From b9c2c58fe601fe661e4111c5458d2e6bce64fc1a Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Thu, 21 Feb 2013 15:26:32 +0100 Subject: [PATCH] Bug 9683: Allow disable rewrite apache mod In Apache config koha-httpd.conf, URL-rewriting is enabled and does not allow to disable mod_rewrite. Also, first rewriting rule "RewriteRule (.+) $1?%1%2 [N,R,NE]" is enabled by default. This rule rewrites nearly every URL. I propose to comment it in sources so that is must be intentionally enabled. This patch sets rewriting options into a conditional tag. Test plan : Test OPAC and intranet with and without mod_rewrite activated. Signed-off-by: Chris Cormack Signed-off-by: Mason James Signed-off-by: Jared Camins-Esakov The new Apache configuration seems to work fine (or at least as "fine" as Apache gets) both with and without mod_rewrite enabled. --- etc/koha-httpd.conf | 48 +++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf index 0e7af51d85..67c54f09a4 100644 --- a/etc/koha-httpd.conf +++ b/etc/koha-httpd.conf @@ -82,18 +82,20 @@ ErrorDocument 404 /cgi-bin/koha/errors/404.pl ErrorDocument 500 /cgi-bin/koha/errors/500.pl -# Rewrite Rules - RewriteEngine On - -# Uncomment to turn on rewrite logging -# RewriteLog __LOG_DIR__/koha-opac-rewrite.log -# RewriteLogLevel 1 - 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] - RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT] + + # Rewrite Rules + RewriteEngine On + + # Uncomment to turn on rewrite logging + #RewriteLog __LOG_DIR__/koha-opac-rewrite.log + #RewriteLogLevel 1 + + 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] + RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT] + ## Intranet @@ -167,14 +169,18 @@ - RewriteEngine On -# Uncomment to turn on rewrite logging -# RewriteLog __LOG_DIR__/koha-intranet-rewrite.log -# RewriteLogLevel 1 + + # Rewrite Rules + RewriteEngine On + + # Uncomment to turn on rewrite logging + #RewriteLog __LOG_DIR__/koha-intranet-rewrite.log + #RewriteLogLevel 1 - 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] - RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT] + 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] + RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT] + -- 2.39.5