summaryrefslogtreecommitdiff
path: root/ext/curl/interface.c
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2009-05-27 22:38:53 +0000
committerPierre Joye <pajoye@php.net>2009-05-27 22:38:53 +0000
commit99eede75b14bf301eaa22ce2be1c36facda2a7c7 (patch)
tree670840fab963a5c2b447faba2e351ccac540c910 /ext/curl/interface.c
parente29517872b6bea35791431baadfe643ae7a4428a (diff)
downloadphp-git-99eede75b14bf301eaa22ce2be1c36facda2a7c7.tar.gz
- mf53: fix build, stderr cannot be used as var or struct member
Diffstat (limited to 'ext/curl/interface.c')
-rw-r--r--ext/curl/interface.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index e09905433f..8dfaade484 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1462,11 +1462,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");
@@ -2061,7 +2061,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 && ch->handlers->stderr->refcount <= 0) {
+ if (ch->handlers->std_err && ch->handlers->std_err->refcount <= 0) {
curl_easy_setopt(ch->cp, CURLOPT_STDERR, stderr);
}
@@ -2087,8 +2087,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);