You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2020/10/15 13:48:39 UTC

svn commit: r1882543 - in /httpd/httpd/branches/2.4.x: ./ CHANGES modules/md/config2.m4

Author: icing
Date: Thu Oct 15 13:48:39 2020
New Revision: 1882543

URL: http://svn.apache.org/viewvc?rev=1882543&view=rev
Log:
Merged /httpd/httpd/trunk:r1882542

  *) mod_md: lowered the required minimal libcurl version from 7.50 to 7.29
     as proposed by <al...@codeit.pro>.


Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/modules/md/config2.m4

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1882542

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1882543&r1=1882542&r2=1882543&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Oct 15 13:48:39 2020
@@ -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 <al...@codeit.pro>. [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

Modified: httpd/httpd/branches/2.4.x/modules/md/config2.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/md/config2.m4?rev=1882543&r1=1882542&r2=1882543&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/md/config2.m4 (original)
+++ httpd/httpd/branches/2.4.x/modules/md/config2.m4 Thu Oct 15 13:48:39 2020
@@ -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 <curl/curlver.h>],[
 #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)