From: Stefan Eissing Date: Thu, 15 Oct 2020 13:48:39 +0000 (+0000) Subject: Merged /httpd/httpd/trunk:r1882542 X-Git-Tag: 2.4.47~250 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bec117f4970614845ed5f1e06ba6df7d635cb705;p=thirdparty%2Fapache%2Fhttpd.git Merged /httpd/httpd/trunk:r1882542 *) mod_md: lowered the required minimal libcurl version from 7.50 to 7.29 as proposed by . git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1882543 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 810ae423d67..2603312f31c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.4.47 + *) mod_md: lowered the required minimal libcurl version from 7.50 to 7.29 + as proposed by . [Stefan Eissing] + *) mod_ssl: Fix request body buffering with PHA in TLSv1.3. [Joe Orton] *) mod_proxy_uwsgi: Fix a crash when sending environment variables with no diff --git a/modules/md/config2.m4 b/modules/md/config2.m4 index bc1ef5caae9..9184a3995de 100644 --- a/modules/md/config2.m4 +++ b/modules/md/config2.m4 @@ -99,7 +99,7 @@ AC_DEFUN([APACHE_CHECK_CURL],[ AC_CHECK_HEADERS([curl/curl.h]) - AC_MSG_CHECKING([for curl version >= 7.50]) + AC_MSG_CHECKING([for curl version >= 7.29]) AC_TRY_COMPILE([#include ],[ #if !defined(LIBCURL_VERSION_MAJOR) #error "Missing libcurl version" @@ -107,7 +107,7 @@ AC_DEFUN([APACHE_CHECK_CURL],[ #if LIBCURL_VERSION_MAJOR < 7 #error "Unsupported libcurl version " LIBCURL_VERSION #endif -#if LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 50 +#if LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 29 #error "Unsupported libcurl version " LIBCURL_VERSION #endif], [AC_MSG_RESULT(OK)