On 12/30, Todd Zullinger wrote:
> The apache config used by tests was updated to use the SetEnvIf
> directive to set the Git-Protocol header in 19113a26b6 ("http: tell
> server that the client understands v1", 2017-10-16).
>
> Setting the Git-Protocol header is restricted to httpd >= 2.4, but
> mod_setenvif and the SetEnvIf directive work with lower versions, at
> least as far back as 2.0, according to the httpd documentation:
>
> https://httpd.apache.org/docs/2.0/mod/mod_setenvif.html
>
> Drop the restriction. Tested with httpd 2.2 and 2.4.
>
> Signed-off-by: Todd Zullinger <t...@pobox.com>
> ---
>
> These tests fail with 2.16.0-rc0 on CentOS-6, which uses
> httpd-2.2.
>
> I removed the version restriction entirely rather than adjust
> the version. I believe SetEnvIf works on httpd >= 2.0. I'm
> not sure if we aim to support anything less than httpd 2.0,
> but I'm betting not. If that's incorrect, I can add some
> IfVersion conditions.
>
> As noted in the commit message, I only tested with httpd 2.2
> and 2.4 (on CentOS 6/7 and Fedora 26-28). If anyone has older
> httpd systems which need support, it would be great if they
> could test this before 2.16.0 is finalized, so we can avoid
> shipping with any failing tests.
Seems good to me. I think I was just being overly cautious when i was
implementing those patches. Thanks!
>
> t/lib-httpd/apache.conf | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
> index df19436314..724d9ae462 100644
> --- a/t/lib-httpd/apache.conf
> +++ b/t/lib-httpd/apache.conf
> @@ -25,6 +25,9 @@ ErrorLog error.log
> <IfModule !mod_headers.c>
> LoadModule headers_module modules/mod_headers.so
> </IfModule>
> +<IfModule !mod_setenvif.c>
> + LoadModule setenvif_module modules/mod_setenvif.so
> +</IfModule>
>
> <IfVersion < 2.4>
> LockFile accept.lock
> @@ -67,9 +70,6 @@ LockFile accept.lock
> <IfModule !mod_unixd.c>
> LoadModule unixd_module modules/mod_unixd.so
> </IfModule>
> -<IfModule !mod_setenvif.c>
> - LoadModule setenvif_module modules/mod_setenvif.so
> -</IfModule>
> </IfVersion>
>
> PassEnv GIT_VALGRIND
> @@ -79,9 +79,7 @@ PassEnv ASAN_OPTIONS
> PassEnv GIT_TRACE
> PassEnv GIT_CONFIG_NOSYSTEM
>
> -<IfVersion >= 2.4>
> - SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
> -</IfVersion>
> +SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
>
> Alias /dumb/ www/
> Alias /auth/dumb/ www/auth/dumb/
> --
> 2.16.0.rc0
>
--
Brandon Williams
