tony2001 Fri Sep 15 15:42:53 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl streams.c config.m4
Log:
MFH: missing part of the fix for #38844
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.14.2.2.2.8&r2=1.14.2.2.2.9&diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.14.2.2.2.8
php-src/ext/curl/streams.c:1.14.2.2.2.9
--- php-src/ext/curl/streams.c:1.14.2.2.2.8 Fri Sep 15 15:33:14 2006
+++ php-src/ext/curl/streams.c Fri Sep 15 15:42:53 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.14.2.2.2.8 2006/09/15 15:33:14 tony2001 Exp $ */
+/* $Id: streams.c,v 1.14.2.2.2.9 2006/09/15 15:42:53 tony2001 Exp $ */
/* This file implements cURL based wrappers.
* NOTE: If you are implementing your own streams that are intended to
@@ -434,7 +434,11 @@
}
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;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.28.2.3.2.2&r2=1.28.2.3.2.3&diff_format=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.28.2.3.2.2
php-src/ext/curl/config.m4:1.28.2.3.2.3
--- php-src/ext/curl/config.m4:1.28.2.3.2.2 Fri Sep 15 13:44:50 2006
+++ php-src/ext/curl/config.m4 Fri Sep 15 15:42:53 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.28.2.3.2.2 2006/09/15 13:44:50 tony2001 Exp $
+dnl $Id: config.m4,v 1.28.2.3.2.3 2006/09/15 15:42:53 tony2001 Exp $
dnl
PHP_ARG_WITH(curl, for cURL support,
@@ -108,6 +108,12 @@
$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,[ ])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
