mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #50101 (name clash between global and local variable)

Browse Source
This commit is contained in:
Antony Dovgal 2010-06-08 13:27:30 +00:00
parent 6b1d256af5
commit 9badd4f0fb
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -171,6 +171,8 @@ PHP NEWS
- Fixed bug #50383 (Exceptions thrown in __call / __callStatic do not include - Fixed bug #50383 (Exceptions thrown in __call / __callStatic do not include
file and line in trace). (Felipe) file and line in trace). (Felipe)
- Fixed bug #50358 (Compile failure compiling ext/phar/util.lo). (Felipe) - Fixed bug #50358 (Compile failure compiling ext/phar/util.lo). (Felipe)
- Fixed bug #50101 (name clash between global and local variable).
(patch by yoarvi at gmail dot com)
- Fixed bug #49893 (Crash while creating an instance of Zend_Mail_Storage_Pop3). - Fixed bug #49893 (Crash while creating an instance of Zend_Mail_Storage_Pop3).
(Dmitry) (Dmitry)
- Fixed bug #49819 (STDOUT losing data with posix_isatty()). (Mike) - Fixed bug #49819 (STDOUT losing data with posix_isatty()). (Mike)

16
TSRM/tsrm_virtual_cwd.c
View File

@ -298,19 +298,19 @@ static int php_is_file_ok(const cwd_state *state) /* {{{ */
} }
/* }}} */ /* }}} */
static void cwd_globals_ctor(virtual_cwd_globals *cwd_globals TSRMLS_DC) /* {{{ */ static void cwd_globals_ctor(virtual_cwd_globals *cwd_g TSRMLS_DC) /* {{{ */
{ {
CWD_STATE_COPY(&cwd_globals->cwd, &main_cwd_state); CWD_STATE_COPY(&cwd_g->cwd, &main_cwd_state);
cwd_globals->realpath_cache_size = 0; cwd_g->realpath_cache_size = 0;
cwd_globals->realpath_cache_size_limit = REALPATH_CACHE_SIZE; cwd_g->realpath_cache_size_limit = REALPATH_CACHE_SIZE;
cwd_globals->realpath_cache_ttl = REALPATH_CACHE_TTL; cwd_g->realpath_cache_ttl = REALPATH_CACHE_TTL;
memset(cwd_globals->realpath_cache, 0, sizeof(cwd_globals->realpath_cache)); memset(cwd_g->realpath_cache, 0, sizeof(cwd_g->realpath_cache));
} }
/* }}} */ /* }}} */
static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals TSRMLS_DC) /* {{{ */ static void cwd_globals_dtor(virtual_cwd_globals *cwd_g TSRMLS_DC) /* {{{ */
{ {
CWD_STATE_FREE(&cwd_globals->cwd); CWD_STATE_FREE(&cwd_g->cwd);
realpath_cache_clean(TSRMLS_C); realpath_cache_clean(TSRMLS_C);
} }
/* }}} */ /* }}} */