diff options
| author | Jeff King <peff@peff.net> | 2023-02-01 14:38:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-01 21:10:34 +0300 |
| commit | edd060dc84fb9b870df6f8344bd86b211608b5be (patch) | |
| tree | f45f64b77819957055d11c0aff195a7edae48eed /t/lib-httpd.sh | |
| parent | d7626170794948b4f0ca270af0316f7e5fa38a99 (diff) | |
t/lib-httpd: bump required apache version to 2.4
Apache 2.4 has been out since early 2012, almost 11 years. And its
predecessor, 2.2, has been out of support since its last release in
2017, over 5 years ago. The last mention on the mailing list was from
around the same time, in this thread:
https://lore.kernel.org/git/20171231023234.21215-1-tmz@pobox.com/
We can probably assume that 2.4 is available everywhere. And the stakes
are fairly low, as the worst case is that such a platform would skip the
http tests.
This lets us clean up a few minor version checks in the config file, but
also revert f1f2b45be0 (tests: adjust the configuration for Apache 2.2,
2016-05-09). Its technique isn't _too_ bad, but certainly required a bit
more explanation than the 2.4 version it replaced. I manually confirmed
that the test in t5551 still behaves as expected (if you replace
"cadabra" with "foo", the server correctly rejects the request).
It will also help future patches which will no longer have to deal with
conditional config for this old version.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-httpd.sh')
| -rw-r--r-- | t/lib-httpd.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 8fc411ff41..5d2d56c445 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -108,10 +108,10 @@ then if test -z "$LIB_HTTPD_MODULE_PATH" then if ! test "$HTTPD_VERSION_MAJOR" -eq 2 || - ! test "$HTTPD_VERSION_MINOR" -ge 2 + ! test "$HTTPD_VERSION_MINOR" -ge 4 then test_skip_or_die GIT_TEST_HTTPD \ - "at least Apache version 2.2 is required" + "at least Apache version 2.4 is required" fi if ! test -d "$DEFAULT_HTTPD_MODULE_PATH" then |