svn: /php/php-src/ branches/PHP_5_3/ext/standard/http_fopen_wrapper.c trunk/ext/standard/http_fopen_wrapper.c
| From: | Ilia Alshanetsky | Date: | Wed, 12 Jan 2011 13:21:27 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/standard/http_fopen_wrapper.c trunk/ext/standard/http_fopen_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64338@lists.php.net to get a copy of this message | ||
iliaa Wed, 12 Jan 2011 13:21:27 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307409
Log:
Fixed variable re-declaration
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
U php/php-src/trunk/ext/standard/http_fopen_wrapper.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2011-01-12 10:42:27 UTC (rev
307408)
+++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2011-01-12 13:21:27 UTC (rev
307409)
@@ -288,12 +288,12 @@
if (!request_fulluri &&
context &&
php_stream_context_get_option(context, "http", "request_fulluri",
&tmpzval) == SUCCESS) {
- zval tmp = **tmpzval;
+ zval ztmp = **tmpzval;
- zval_copy_ctor(&tmp);
- convert_to_boolean(&tmp);
- request_fulluri = Z_BVAL(tmp) ? 1 : 0;
- zval_dtor(&tmp);
+ zval_copy_ctor(&ztmp);
+ convert_to_boolean(&ztmp);
+ request_fulluri = Z_BVAL(ztmp) ? 1 : 0;
+ zval_dtor(&ztmp);
}
if (request_fulluri) {
@@ -543,10 +543,10 @@
}
if (header_init) {
- zval *tmp;
- MAKE_STD_ZVAL(tmp);
- array_init(tmp);
- ZEND_SET_SYMBOL(EG(active_symbol_table), "http_response_header", tmp);
+ zval *ztmp;
+ MAKE_STD_ZVAL(ztmp);
+ array_init(ztmp);
+ ZEND_SET_SYMBOL(EG(active_symbol_table), "http_response_header", ztmp);
}
{
Modified: php/php-src/trunk/ext/standard/http_fopen_wrapper.c
===================================================================
--- php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2011-01-12 10:42:27 UTC (rev 307408)
+++ php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2011-01-12 13:21:27 UTC (rev 307409)
@@ -288,12 +288,12 @@
if (!request_fulluri &&
context &&
php_stream_context_get_option(context, "http", "request_fulluri",
&tmpzval) == SUCCESS) {
- zval tmp = **tmpzval;
+ zval ztmp = **tmpzval;
- zval_copy_ctor(&tmp);
- convert_to_boolean(&tmp);
- request_fulluri = Z_BVAL(tmp) ? 1 : 0;
- zval_dtor(&tmp);
+ zval_copy_ctor(&ztmp);
+ convert_to_boolean(&ztmp);
+ request_fulluri = Z_BVAL(ztmp) ? 1 : 0;
+ zval_dtor(&ztmp);
}
if (request_fulluri) {
@@ -540,10 +540,10 @@
}
if (header_init) {
- zval *tmp;
- MAKE_STD_ZVAL(tmp);
- array_init(tmp);
- ZEND_SET_SYMBOL(EG(active_symbol_table), "http_response_header", tmp);
+ zval *ztmp;
+ MAKE_STD_ZVAL(ztmp);
+ array_init(ztmp);
+ ZEND_SET_SYMBOL(EG(active_symbol_table), "http_response_header", ztmp);
}
{