cvs: php-src /ext/curl config.m4 streams.c

tony2001 Fri Sep 15 13:43:55 2006 UTC Modified files: /php-src/ext/curl streams.c config.m4 Log: 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.22&r2=1.23&diff_format=u Index: php-src/ext/curl/streams.c diff -u php-src/ext/curl/streams.c:1.22 php-src/ext/curl/streams.c:1.23 --- php-src/ext/curl/streams.c:1.22 Wed Aug 30 18:21:27 2006 +++ php-src/ext/curl/streams.c Fri Sep 15 13:43:55 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.22 2006/08/30 18:21:27 iliaa Exp $ */ +/* $Id: streams.c,v 1.23 2006/09/15 13:43:55 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.33&r2=1.34&diff_format=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.33 php-src/ext/curl/config.m4:1.34 --- php-src/ext/curl/config.m4:1.33 Sat Sep 9 20:03:55 2006 +++ php-src/ext/curl/config.m4 Fri Sep 15 13:43:55 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.33 2006/09/09 20:03:55 bjori Exp $ +dnl $Id: config.m4,v 1.34 2006/09/15 13:43:55 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