tony2001 Tue Nov 22 17:53:51 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/php-src/ext/curl config.m4
Log:
MF51: fix #35341 (Fix for bug #33760 breaks build with older curl)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.88&r2=1.1247.2.920.2.89&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.88 php-src/NEWS:1.1247.2.920.2.89
--- php-src/NEWS:1.1247.2.920.2.88 Fri Nov 18 16:24:05 2005
+++ php-src/NEWS Tue Nov 22 17:53:48 2005
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
23 Nov 2005, Version 4.4.2
+- Fixed bug #35341 (Fix for bug #33760 breaks build with older curl). (Tony)
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.20.2.2.2.1&r2=1.20.2.2.2.2&ty=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.20.2.2.2.1
php-src/ext/curl/config.m4:1.20.2.2.2.2
--- php-src/ext/curl/config.m4:1.20.2.2.2.1 Wed Nov 2 10:03:36 2005
+++ php-src/ext/curl/config.m4 Tue Nov 22 17:53:50 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.20.2.2.2.1 2005/11/02 15:03:36 mike Exp $
+dnl $Id: config.m4,v 1.20.2.2.2.2 2005/11/22 22:53:50 tony2001 Exp $
dnl
PHP_ARG_WITH(curl, for CURL support,
@@ -50,21 +50,21 @@
fi
AC_MSG_CHECKING([for SSL support in libcurl])
- CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
- if test "$CURL_SSL" == "SSL"; then
+ 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])
AC_MSG_CHECKING([for SSL library used])
CURL_SSL_FLAVOUR=
for i in $CURL_LIBS; do
- if test "$i" == "-lssl"; then
+ if test "$i" = "-lssl"; then
CURL_SSL_FLAVOUR="openssl"
AC_MSG_RESULT([openssl])
AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
AC_CHECK_HEADERS([openssl/crypto.h])
break
- elif test "$i" == "-lgnutls"; then
+ elif test "$i" = "-lgnutls"; then
CURL_SSL_FLAVOUR="gnutls"
AC_MSG_RESULT([gnutls])
AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
