fix #38844 (curl_easy_strerror() is defined only since cURL 7.12.0)

diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index 941df3c97070a80e2dceb16ccb546a379f5081ef..33f0742fff6c7d30f44c5611fced06fc25fd5ab7 100644 (file)
--- 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 2dfd49c43d7c57c36e7494c307a85bed33a0020c..b1d19e2e07107f6298cbb4bb4b12ece7db096b63 100644 (file)
--- 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++;
                        }
                }