diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/curl/config.m4 | 8 | ||||
| -rw-r--r-- | ext/curl/streams.c | 2 |
3 files changed, 12 insertions, 0 deletions
@@ -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 diff --git a/ext/curl/config.m4 b/ext/curl/config.m4 index c93c118d1b..00b410b357 100644 --- a/ext/curl/config.m4 +++ b/ext/curl/config.m4 @@ -101,6 +101,14 @@ if test "$PHP_CURL" != "no"; then $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 diff --git a/ext/curl/streams.c b/ext/curl/streams.c index ef41a2dc69..dd7fcd94a9 100644 --- a/ext/curl/streams.c +++ b/ext/curl/streams.c @@ -445,7 +445,9 @@ php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename, 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++; } } |