tony2001 Tue Nov 22 17:53:34 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/curl config.m4
Log:
fix #35341 (Fix for bug #33760 breaks build with older curl)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.212&r2=1.2027.2.213&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.212 php-src/NEWS:1.2027.2.213
--- php-src/NEWS:1.2027.2.212 Sun Nov 20 15:14:21 2005
+++ php-src/NEWS Tue Nov 22 17:53:32 2005
@@ -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)
http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.28.2.2&r2=1.28.2.3&ty=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.28.2.2 php-src/ext/curl/config.m4:1.28.2.3
--- php-src/ext/curl/config.m4:1.28.2.2 Wed Oct 26 07:33:25 2005
+++ php-src/ext/curl/config.m4 Tue Nov 22 17:53:34 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.28.2.2 2005/10/26 11:33:25 sniper Exp $
+dnl $Id: config.m4,v 1.28.2.3 2005/11/22 22:53:34 tony2001 Exp $
dnl
PHP_ARG_WITH(curl, for CURL support,
@@ -50,7 +50,7 @@
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])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
