Merge branch 'js/http-custom-headers'
commit848b99b14e5287b492f095ca1ca6bce270880015
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:35 +0000 (17 14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:35 +0000 (17 14:38 -0700)
tree02445320423c737dbf77f0e67c8996e4f025d14f
parentfd704b16f14a43f7d6688f0059cf9ddf9b1d9b2f
parent0bbe731714e0042888eb99a8ff3f4cdf245ffce6
Merge branch 'js/http-custom-headers'

Update tests for "http.extraHeaders=<header>" to be portable back
to Apache 2.2 (the original depended on <RequireAll/> which is a
more recent feature).

* js/http-custom-headers:
  submodule: ensure that -c http.extraheader is heeded
  t5551: make the test for extra HTTP headers more robust
  tests: adjust the configuration for Apache 2.2
t/lib-httpd/apache.conf