From c4d93d76f29d0935f1cad712a463003a45c42ad6 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 19 Apr 2020 13:39:08 +0200 Subject: [PATCH] Bug 18670: Remove RewriteLog and RewriteLogLevel from sample config files It looks like RewriteLog will no longer work with Apache 2.4 and later. RewriteLog Those familiar with earlier versions of mod_rewrite will no doubt be looking for the RewriteLog and RewriteLogLevel directives. This functionality has been completely replaced by the new per-module logging configuration mentioned above. http://httpd.apache.org/docs/current/mod/mod_rewrite.html All lines removed were commented out, so there should be no change in behaviour or side effects. To test. - Verify every mention of RewriteLog has been removed from Koha - Verify patch by reading it Signed-off-by: David Nind Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit 8a8130c0524efd4c211155cecce78392a76804f6) Signed-off-by: Lucas Gass --- debian/templates/apache-site-https.conf.in | 2 -- debian/templates/apache-site.conf.in | 2 -- etc/koha-httpd.conf | 8 -------- 3 files changed, 12 deletions(-) diff --git a/debian/templates/apache-site-https.conf.in b/debian/templates/apache-site-https.conf.in index b0f68833b4..196a415b8e 100644 --- a/debian/templates/apache-site-https.conf.in +++ b/debian/templates/apache-site-https.conf.in @@ -34,7 +34,6 @@ ErrorLog /var/log/koha/__KOHASITE__/opac-error.log # TransferLog /var/log/koha/__KOHASITE__/opac-access.log -# RewriteLog /var/log/koha/__KOHASITE__/opac-rewrite.log # Intranet @@ -62,5 +61,4 @@ ErrorLog /var/log/koha/__KOHASITE__/intranet-error.log # TransferLog /var/log/koha/__KOHASITE__/intranet-access.log -# RewriteLog /var/log/koha/__KOHASITE__/intranet-rewrite.log diff --git a/debian/templates/apache-site.conf.in b/debian/templates/apache-site.conf.in index 654674d5d7..9e94f599f3 100644 --- a/debian/templates/apache-site.conf.in +++ b/debian/templates/apache-site.conf.in @@ -16,7 +16,6 @@ ErrorLog /var/log/koha/__KOHASITE__/opac-error.log # TransferLog /var/log/koha/__KOHASITE__/opac-access.log -# RewriteLog /var/log/koha/__KOHASITE__/opac-rewrite.log # Intranet @@ -35,5 +34,4 @@ ErrorLog /var/log/koha/__KOHASITE__/intranet-error.log # TransferLog /var/log/koha/__KOHASITE__/intranet-access.log -# RewriteLog /var/log/koha/__KOHASITE__/intranet-rewrite.log diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf index 2fe7df456e..20a9b45f2c 100644 --- a/etc/koha-httpd.conf +++ b/etc/koha-httpd.conf @@ -100,10 +100,6 @@ # Rewrite Rules RewriteEngine On - # Uncomment to turn on rewrite logging - #RewriteLog __LOG_DIR__/koha-opac-rewrite.log - #RewriteLogLevel 1 - #The following two directives are unnecessary to proper Koha functioning. #RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*) #RewriteRule (.+) $1?%1%2 [N,R,NE] @@ -224,10 +220,6 @@ # Rewrite Rules RewriteEngine On - # Uncomment to turn on rewrite logging - #RewriteLog __LOG_DIR__/koha-intranet-rewrite.log - #RewriteLogLevel 1 - #The following two directives are unnecessary to proper Koha functioning. #RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*) #RewriteRule (.+) $1?%1%2 [N,R,NE] -- 2.39.5