- fix build, stderr cannot be used as var or struct member

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 348d8eb35da68cd10ce31ed637f85cddcd13a102..2f44b4f31a642a7c276bc001290547256cbcbb93 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1675,11 +1675,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");
@@ -2283,7 +2283,7 @@ 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) {
+       if (ch->handlers->std_err && Z_REFCOUNT_P(ch->handlers->std_err) <= 0) {
                curl_easy_setopt(ch->cp, CURLOPT_STDERR, stderr);
        }
 
@@ -2312,8 +2312,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 41de89f9dd7a78a46903218edd69e3ba4dba26ff..edf215ba722ab06c81e6d9119ecb80063bfc1827 100644 (file)
--- 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;