From 8fc1a772d4957339efa832d328775613cf6679f4 Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Fri, 13 May 2016 16:40:11 -0600 Subject: [PATCH] Bug 16520: Add new Plack-SetEnv syntax to Apache configuration files This was not added to the old etc/koha-httpd.conf because that file has no infrastructure for Plack anyway. --- debian/templates/apache-shared.conf | 5 +++++ debian/templates/apache-site.conf.in | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/debian/templates/apache-shared.conf b/debian/templates/apache-shared.conf index 9ee3b0f..b923578 100644 --- a/debian/templates/apache-shared.conf +++ b/debian/templates/apache-shared.conf @@ -74,3 +74,8 @@ ErrorDocument 404 /cgi-bin/koha/errors/404.pl ErrorDocument 500 /cgi-bin/koha/errors/500.pl RewriteEngine On + + + # Erase any X-Koha-SetEnv headers from the client + RequestHeader unset X-Koha-SetEnv + diff --git a/debian/templates/apache-site.conf.in b/debian/templates/apache-site.conf.in index 3f7ad52..97a2a28 100644 --- a/debian/templates/apache-site.conf.in +++ b/debian/templates/apache-site.conf.in @@ -14,6 +14,8 @@ SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml" SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__" SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__" + RequestHeader add X-Koha-SetEnv "MEMCACHED_SERVERS __MEMCACHED_SERVERS__" + RequestHeader add X-Koha-SetEnv "MEMCACHED_NAMESPACE __MEMCACHED_SERVERS__" AssignUserID __UNIXUSER__ __UNIXGROUP__ ErrorLog /var/log/koha/__KOHASITE__/opac-error.log @@ -35,6 +37,8 @@ SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml" SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__" SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__" + RequestHeader add X-Koha-SetEnv "MEMCACHED_SERVERS __MEMCACHED_SERVERS__" + RequestHeader add X-Koha-SetEnv "MEMCACHED_NAMESPACE __MEMCACHED_SERVERS__" AssignUserID __UNIXUSER__ __UNIXGROUP__ ErrorLog /var/log/koha/__KOHASITE__/intranet-error.log -- 2.8.1