cvs: php-src /ext/curl config.m4 streams.c

tony2001 Fri Sep 15 15:42:39 2006 UTC Modified files: /php-src/ext/curl streams.c config.m4 Log: missing part of the fix for #38844 http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.24&r2=1.25&diff_format=u Index: php-src/ext/curl/streams.c diff -u php-src/ext/curl/streams.c:1.24 php-src/ext/curl/streams.c:1.25 --- php-src/ext/curl/streams.c:1.24 Fri Sep 15 15:33:30 2006 +++ php-src/ext/curl/streams.c Fri Sep 15 15:42:39 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.24 2006/09/15 15:33:30 tony2001 Exp $ */ +/* $Id: streams.c,v 1.25 2006/09/15 15:42:39 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.34&r2=1.35&diff_format=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.34 php-src/ext/curl/config.m4:1.35 --- php-src/ext/curl/config.m4:1.34 Fri Sep 15 13:43:55 2006 +++ php-src/ext/curl/config.m4 Fri Sep 15 15:42:39 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.34 2006/09/15 13:43:55 tony2001 Exp $ +dnl $Id: config.m4,v 1.35 2006/09/15 15:42:39 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,[ ])