[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c php_curl.h

[Pierre-Alain Joye]

pajoye          Wed May 27 22:38:53 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/curl   interface.c php_curl.h 
  Log:
  - mf53: fix build, stderr cannot be used as var or struct member
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.52&r2=1.62.2.14.2.53&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.52 
php-src/ext/curl/interface.c:1.62.2.14.2.53
--- php-src/ext/curl/interface.c:1.62.2.14.2.52 Wed May 27 09:57:13 2009
+++ php-src/ext/curl/interface.c        Wed May 27 22:38:53 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.52 2009/05/27 09:57:13 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.53 2009/05/27 22:38:53 pajoye Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1462,11 +1462,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");
@@ -2061,7 +2061,7 @@
 #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 @@
        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.44.2.2.2.6&r2=1.44.2.2.2.7&diff_format=u
Index: php-src/ext/curl/php_curl.h
diff -u php-src/ext/curl/php_curl.h:1.44.2.2.2.6 
php-src/ext/curl/php_curl.h:1.44.2.2.2.7
--- php-src/ext/curl/php_curl.h:1.44.2.2.2.6    Tue May 26 15:50:44 2009
+++ php-src/ext/curl/php_curl.h Wed May 27 22:38:53 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_curl.h,v 1.44.2.2.2.6 2009/05/26 15:50:44 jani Exp $ */
+/* $Id: php_curl.h,v 1.44.2.2.2.7 2009/05/27 22:38:53 pajoye Exp $ */
 
 #ifndef _PHP_CURL_H
 #define _PHP_CURL_H
@@ -101,7 +101,7 @@
        php_curl_write *write_header;
        php_curl_read  *read;
        zval           *passwd;
-       zval           *stderr;
+       zval           *std_err;
 } php_curl_handlers;
 
 struct _php_curl_error  {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php