]> granicus.if.org Git - php/commitdiff
Fixed variable re-declaration
authorIlia Alshanetsky <iliaa@php.net>
Wed, 12 Jan 2011 13:21:27 +0000 (13:21 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Wed, 12 Jan 2011 13:21:27 +0000 (13:21 +0000)
ext/standard/http_fopen_wrapper.c

index 2de931ee997f3df29d103eb935fc8c08656203f2..9304949901bd0dfd13639b22e250732e7475aac2 100644 (file)
@@ -288,12 +288,12 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
        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 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
        }
 
        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);
        }
 
        {