Re: [PATCH] lib-httpd/apache.conf: check version only after mod_version loads
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:57:52
Jeff King [off-list ref] writes:
quoted hunk
Cool. I think the patch should look like the one below, then. Just to double-check that I have explained the issue correctly, can you share the output of "apache2 -l"? Mine has: $ apache2 -l Compiled in modules: core.c mod_log_config.c mod_logio.c mod_version.c prefork.c http_core.c mod_so.c which explains why it works here. I'm assuming you will not have mod_version.c compiled in. -- >8 -- Subject: lib-httpd/apache.conf: check version only after mod_version loads Commit 0442743 introduced an <IfVersion> directive near the top of the apache config file. However, at that point we have not yet checked for and loaded the mod_version module. This means that the directive will behave oddly if mod_version is dynamically loaded, failing to match when it should. We can fix this by moving the whole block below the LoadModule directive for mod_version. Reported-by: Brian Gernhardt <redacted> Signed-off-by: Jeff King <redacted> --- t/lib-httpd/apache.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index 56ae548..dd17e3a 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf@@ -1,7 +1,4 @@ ServerName dummy ServerName dummy -<IfVersion < 2.4> -LockFile accept.lock -</IfVersion> PidFile httpd.pid DocumentRoot www LogFormat "%h %l %u %t \"%r\" %>s %b" common@@ -26,6 +23,10 @@ ErrorLog error.log LoadModule version_module modules/mod_version.so </IfModule> +<IfVersion < 2.4> +LockFile accept.lock +</IfVersion> +
Once you see it in the patch form, it is very clear what this change does and why it is necessary in the context ;-) Thanks, both of you, for digging this down to the root cause; you guys have done before it graduates to 'master', which I especially appreciate. Will queue.