From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 1 Mar 2023 00:38:47 +0000 (-0800)
Subject: Merge branch 'jk/http-test-fixes'
X-Git-Tag: v2.40.0-rc1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2893ea403562f94a11edf5c3cc6beb44685d991;p=thirdparty%2Fgit.git

Merge branch 'jk/http-test-fixes'

Various fix-ups on HTTP tests.

* jk/http-test-fixes:
  t5559: make SSL/TLS the default
  t5559: fix test failures with LIB_HTTPD_SSL
  t/lib-httpd: enable HTTP/2 "h2" protocol, not just h2c
  t/lib-httpd: respect $HTTPD_PROTO in expect_askpass()
  t5551: drop curl trace lines without headers
  t5551: handle v2 protocol in cookie test
  t5551: simplify expected cookie file
  t5551: handle v2 protocol in upload-pack service test
  t5551: handle v2 protocol when checking curl trace
  t5551: stop forcing clone to run with v0 protocol
  t5551: handle HTTP/2 when checking curl trace
  t5551: lower-case headers in expected curl trace
  t5551: drop redundant grep for Accept-Language
  t5541: simplify and move "no empty path components" test
  t5541: stop marking "used receive-pack service" test as v0 only
  t5541: run "used receive-pack service" test earlier
---

b2893ea403562f94a11edf5c3cc6beb44685d991
diff --cc t/lib-httpd/apache.conf
index e31293a45f,6d5d66caf8..31f82fa093
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@@ -31,9 -31,20 +31,9 @@@ ErrorLog error.lo
  
  <IfDefine HTTP2>
  LoadModule http2_module modules/mod_http2.so
- Protocols h2c
+ Protocols h2 h2c
  </IfDefine>
  
 -<IfVersion < 2.4>
 -LockFile accept.lock
 -</IfVersion>
 -
 -<IfVersion < 2.1>
 -<IfModule !mod_auth.c>
 -	LoadModule auth_module modules/mod_auth.so
 -</IfModule>
 -</IfVersion>
 -
 -<IfVersion >= 2.1>
  <IfModule !mod_auth_basic.c>
  	LoadModule auth_basic_module modules/mod_auth_basic.so
  </IfModule>