cvs: php-src(PHP_5_2) / NEWS /ext/curl config.m4 streams.c

tony2001 Fri Sep 15 13:44:50 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/curl streams.c config.m4 /php-src NEWS Log: MFH: fix #38844 (curl_easy_strerror() is defined only since cURL 7.12.0) http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.14.2.2.2.6&r2=1.14.2.2.2.7&diff_format=u Index: php-src/ext/curl/streams.c diff -u php-src/ext/curl/streams.c:1.14.2.2.2.6 php-src/ext/curl/streams.c:1.14.2.2.2.7 --- php-src/ext/curl/streams.c:1.14.2.2.2.6 Wed Aug 30 17:49:10 2006 +++ php-src/ext/curl/streams.c Fri Sep 15 13:44:50 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.14.2.2.2.6 2006/08/30 17:49:10 iliaa Exp $ */ +/* $Id: streams.c,v 1.14.2.2.2.7 2006/09/15 13:44:50 tony2001 Exp $ */ /* This file implements cURL based wrappers. * NOTE: If you are implementing your own streams that are intended to @@ -445,7 +445,9 @@ if (msg->data.result == CURLE_OK) { continue; } else { +#if HAVE_CURL_EASY_STRERROR php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", curl_easy_strerror(msg->data.result)); +#endif msg_found++; } } http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.28.2.3.2.1&r2=1.28.2.3.2.2&diff_format=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.28.2.3.2.1 php-src/ext/curl/config.m4:1.28.2.3.2.2 --- php-src/ext/curl/config.m4:1.28.2.3.2.1 Sat Sep 9 20:04:50 2006 +++ php-src/ext/curl/config.m4 Fri Sep 15 13:44:50 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.28.2.3.2.1 2006/09/09 20:04:50 bjori Exp $ +dnl $Id: config.m4,v 1.28.2.3.2.2 2006/09/15 13:44:50 tony2001 Exp $ dnl PHP_ARG_WITH(curl, for cURL support, @@ -101,6 +101,14 @@ $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR ]) + PHP_CHECK_LIBRARY(curl,curl_easy_strerror, + [ + AC_DEFINE(HAVE_CURL_EASY_STRERROR,1,[ ]) + ],[],[ + $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR + ]) + + if test "$PHP_CURLWRAPPERS" != "no" ; then AC_DEFINE(PHP_CURL_URL_WRAPPERS,1,[ ]) fi http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.252&r2=1.2027.2.547.2.253&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.252 php-src/NEWS:1.2027.2.547.2.253 --- php-src/NEWS:1.2027.2.547.2.252 Thu Sep 14 18:04:40 2006 +++ php-src/NEWS Fri Sep 15 13:44:50 2006 @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Sep 2006, PHP 5.2.0 +- Fixed bug #38844 (curl_easy_strerror() is defined only since cURL 7.12.0). + (Tony) 14 Sep 2006, PHP 5.2.0RC4 - Added DSA key generation support to openssl_pkey_new(), FR #38731