> On 09 May 2016, at 08:18, Johannes Schindelin <johannes.schinde...@gmx.de> > wrote: > > Lars Schneider noticed that the configuration introduced to test the extra > HTTP headers cannot be used with Apache 2.2 (which is still actively > maintained, as pointed out by Junio Hamano). > > To let the tests pass with Apache 2.2 again, let's substitute the > offending <RequireAll> and `expr` by using old school RewriteCond > statements.
All Apache 2.2 tests run nicely on Travis CI with Ubuntu and OSX using this patch series: https://travis-ci.org/larsxschneider/git/builds/128955548 Thanks, Lars > > Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> > --- > t/lib-httpd/apache.conf | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf > index b8ed96f..29b34bb 100644 > --- a/t/lib-httpd/apache.conf > +++ b/t/lib-httpd/apache.conf > @@ -103,10 +103,6 @@ Alias /auth/dumb/ www/auth/dumb/ > Header set Set-Cookie name=value > </LocationMatch> > <LocationMatch /smart_headers/> > - <RequireAll> > - Require expr %{HTTP:x-magic-one} == 'abra' > - Require expr %{HTTP:x-magic-two} == 'cadabra' > - </RequireAll> > SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} > SetEnv GIT_HTTP_EXPORT_ALL > </LocationMatch> > @@ -136,6 +132,14 @@ RewriteRule ^/ftp-redir/(.*)$ ftp://localhost:1000/$1 > [R=302] > RewriteRule ^/loop-redir/x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-(.*) /$1 > [R=302] > RewriteRule ^/loop-redir/(.*)$ /loop-redir/x-$1 [R=302] > > +# Apache 2.2 does not understand <RequireAll>, so we use RewriteCond. > +# And as RewriteCond unfortunately lacks "not equal" matching, we use this > +# ugly trick to fail *unless* the two headers are present. > +RewriteCond %{HTTP:x-magic-one} =abra > +RewriteCond %{HTTP:x-magic-two} =cadabra > +RewriteRule ^/smart_headers/.* - [L] > +RewriteRule ^/smart_headers/.* - [F] > + > <IfDefine SSL> > LoadModule ssl_module modules/mod_ssl.so > > -- > 2.8.2.463.g99156ee > > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
