mirror of
https://github.com/php/php-src.git
synced 2025-08-19 08:49:28 +02:00
Fixed variable re-declaration
This commit is contained in:
parent
92d82619d7
commit
c83278ef22
1 changed files with 9 additions and 9 deletions
|
@ -288,12 +288,12 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
|
||||||
if (!request_fulluri &&
|
if (!request_fulluri &&
|
||||||
context &&
|
context &&
|
||||||
php_stream_context_get_option(context, "http", "request_fulluri", &tmpzval) == SUCCESS) {
|
php_stream_context_get_option(context, "http", "request_fulluri", &tmpzval) == SUCCESS) {
|
||||||
zval tmp = **tmpzval;
|
zval ztmp = **tmpzval;
|
||||||
|
|
||||||
zval_copy_ctor(&tmp);
|
zval_copy_ctor(&ztmp);
|
||||||
convert_to_boolean(&tmp);
|
convert_to_boolean(&ztmp);
|
||||||
request_fulluri = Z_BVAL(tmp) ? 1 : 0;
|
request_fulluri = Z_BVAL(ztmp) ? 1 : 0;
|
||||||
zval_dtor(&tmp);
|
zval_dtor(&ztmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request_fulluri) {
|
if (request_fulluri) {
|
||||||
|
@ -543,10 +543,10 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (header_init) {
|
if (header_init) {
|
||||||
zval *tmp;
|
zval *ztmp;
|
||||||
MAKE_STD_ZVAL(tmp);
|
MAKE_STD_ZVAL(ztmp);
|
||||||
array_init(tmp);
|
array_init(ztmp);
|
||||||
ZEND_SET_SYMBOL(EG(active_symbol_table), "http_response_header", tmp);
|
ZEND_SET_SYMBOL(EG(active_symbol_table), "http_response_header", ztmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue