From 91a262adbd2c2869d396c85fbd80c0f65c886e5d Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Thu, 28 May 2009 09:09:02 +0000 Subject: [PATCH] - Fix build for winblows --- ext/curl/interface.c | 14 +++++++------- ext/curl/php_curl.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 06d99bda43..c429c01ded 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1691,11 +1691,11 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu 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 @@ static void _php_curl_close_ex(php_curl *ch TSRMLS_DC) #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 @@ static void _php_curl_close_ex(php_curl *ch TSRMLS_DC) 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); diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index 7fc8ebedde..e85fa4df25 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -107,7 +107,7 @@ typedef struct { php_curl_write *write_header; php_curl_read *read; zval *passwd; - zval *stderr; + zval *std_err; php_curl_progress *progress; } php_curl_handlers; -- 2.50.1