From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 27 Mar 2024 15:59:42 +0000 (+0100)
Subject: Merge branch 'jk/httpd-test-updates'
X-Git-Tag: v2.39.4~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef0fc42829267ec004a557b9fad1a03f491b2244;p=thirdparty%2Fgit.git

Merge branch 'jk/httpd-test-updates'

Test update.

* jk/httpd-test-updates:
  t/lib-httpd: increase ssl key size to 2048 bits
  t/lib-httpd: drop SSLMutex config
  t/lib-httpd: bump required apache version to 2.4
  t/lib-httpd: bump required apache version to 2.2

This is a backport onto the `maint-2.39` branch, to improve the CI
health of that branch.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---

ef0fc42829267ec004a557b9fad1a03f491b2244
diff --cc t/lib-httpd/apache.conf
index 6d5d66caf8,51a4fbcf62..693b75e0ae
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@@ -31,20 -31,9 +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>