fix #35341 (Fix for bug #33760 breaks build with older curl)

diff --git a/NEWS b/NEWS
index 1e03755015067250771d06836067ccd8480d10fd..77fe45f7fed9dd91ab9d3a333ebcc48bc8951de2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Nov 2005, PHP 5.1
+- Fixed bug #35341 (Fix for bug #33760 breaks build with older curl). (Tony)
 - Fixed bug #35303 (PDO prepare() crashes with invalid parameters). (Ilia)
 - Fixed bug #35293 (PDO segfaults when using persistent connections). (Tony)
 - Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)

diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index 94baf6af226db1090f0d94acd89fd0882499fcc7..fdea836c92ada058ea979d6b9831009a84dbfa90 100644 (file)
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -50,7 +50,7 @@ if test "$PHP_CURL" != "no"; then
   fi
   
   AC_MSG_CHECKING([for SSL support in libcurl])
-  CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
+  CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
   if test "$CURL_SSL" = "SSL"; then
     AC_MSG_RESULT([yes])
     AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with  SSL support])