From: Antony Dovgal <tony2001@php.net>
Date: Fri, 15 Sep 2006 15:42:53 +0000 (+0000)
Subject: MFH: missing part of the fix for #38844
X-Git-Tag: php-5.2.0RC5~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c40975eda577e46f1e268c706bfc4b5a7b40af55;p=php

MFH: missing part of the fix for #38844
---

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;
 		}