diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-09-15 15:42:53 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-09-15 15:42:53 +0000 |
| commit | c40975eda577e46f1e268c706bfc4b5a7b40af55 (patch) | |
| tree | 18fb9795c2c382e53ebd76304776f085c249b14c | |
| parent | fcf4f87919c1f76b69044e2ab233281b9d476ec6 (diff) | |
| download | php-git-c40975eda577e46f1e268c706bfc4b5a7b40af55.tar.gz | |
MFH: missing part of the fix for #38844
| -rw-r--r-- | ext/curl/config.m4 | 6 | ||||
| -rw-r--r-- | ext/curl/streams.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4 index 00b410b357..8fe2ee300f 100644 --- a/ext/curl/config.m4 +++ b/ext/curl/config.m4 @@ -108,6 +108,12 @@ if test "$PHP_CURL" != "no"; then $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR ]) + PHP_CHECK_LIBRARY(curl,curl_multi_strerror, + [ + AC_DEFINE(HAVE_CURL_MULTI_STRERROR,1,[ ]) + ],[],[ + $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR + ]) if test "$PHP_CURLWRAPPERS" != "no" ; then AC_DEFINE(PHP_CURL_URL_WRAPPERS,1,[ ]) diff --git a/ext/curl/streams.c b/ext/curl/streams.c index c021d6eb0c..4c16a2cf2f 100644 --- a/ext/curl/streams.c +++ b/ext/curl/streams.c @@ -434,7 +434,11 @@ php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename, } if (m != CURLM_OK) { +#if HAVE_CURL_MULTI_STRERROR php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", curl_multi_strerror(m)); +#else + php_error_docref(NULL TSRMLS_CC, E_WARNING, "There was an error mcode=%d", m); +#endif php_stream_close(stream); return NULL; } |