jani Thu May 28 09:09:03 2009 UTC Modified files: /php-src/ext/curl interface.c php_curl.h Log: - Fix build for winblows http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.167&r2=1.168&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.167 php-src/ext/curl/interface.c:1.168 --- php-src/ext/curl/interface.c:1.167 Tue May 26 15:48:28 2009 +++ php-src/ext/curl/interface.c Thu May 28 09:09:02 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.167 2009/05/26 15:48:28 jani Exp $ */ +/* $Id: interface.c,v 1.168 2009/05/28 09:09:02 jani Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -1691,11 +1691,11 @@ break; case CURLOPT_STDERR: if (((php_stream *) what)->mode[0] != 'r') { - if (ch->handlers->stderr) { - zval_ptr_dtor(&ch->handlers->stderr); + if (ch->handlers->std_err) { + zval_ptr_dtor(&ch->handlers->std_err); } zval_add_ref(zvalue); - ch->handlers->stderr = *zvalue; + ch->handlers->std_err = *zvalue; zend_list_addref(Z_LVAL_PP(zvalue)); } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "the provided file handle is not writable"); @@ -2349,8 +2349,8 @@ #endif /* Prevent crash inside cURL if passed file has already been closed */ - if (ch->handlers->stderr && Z_REFCOUNT_P(ch->handlers->stderr) <= 0) { - curl_easy_setopt(ch->cp, CURLOPT_STDERR, stderr); + if (ch->handlers->std_err && Z_REFCOUNT_P(ch->handlers->std_err) <= 0) { + curl_easy_setopt(ch->cp, CURLOPT_STDERR, std_err); } curl_easy_cleanup(ch->cp); @@ -2378,8 +2378,8 @@ if (ch->handlers->passwd) { zval_ptr_dtor(&ch->handlers->passwd); } - if (ch->handlers->stderr) { - zval_ptr_dtor(&ch->handlers->stderr); + if (ch->handlers->std_err) { + zval_ptr_dtor(&ch->handlers->std_err); } if (ch->header.str_len > 0) { efree(ch->header.str); http://cvs.php.net/viewvc.cgi/php-src/ext/curl/php_curl.h?r1=1.54&r2=1.55&diff_format=u Index: php-src/ext/curl/php_curl.h diff -u php-src/ext/curl/php_curl.h:1.54 php-src/ext/curl/php_curl.h:1.55 --- php-src/ext/curl/php_curl.h:1.54 Tue May 26 15:48:28 2009 +++ php-src/ext/curl/php_curl.h Thu May 28 09:09:02 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_curl.h,v 1.54 2009/05/26 15:48:28 jani Exp $ */ +/* $Id: php_curl.h,v 1.55 2009/05/28 09:09:02 jani Exp $ */ #ifndef _PHP_CURL_H #define _PHP_CURL_H @@ -107,7 +107,7 @@ php_curl_write *write_header; php_curl_read *read; zval *passwd; - zval *stderr; + zval *std_err; php_curl_progress *progress; } php_curl_handlers;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php