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

fix of fix related to __autoload. (ext/standard/tests/network/bug20134.phpt passes again)

Browse Source
This commit is contained in:
Dmitry Stogov 2004-03-28 09:37:30 +00:00
parent 58a52b1641
commit 09d1d232fc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Zend/zend_execute_API.c
View File

@ -893,6 +893,14 @@ ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***
return SUCCESS;
}
/* The compiler is not-reentrant. Make sure we __autoload() only during run-time
* (doesn't impact fuctionality of __autoload()
*/
if (zend_is_compiling(TSRMLS_C)) {
free_alloca(lc_name);
return FAILURE;
}
if (EG(in_autoload) == NULL) {
ALLOC_HASHTABLE(EG(in_autoload));
zend_hash_init(EG(in_autoload), 0, NULL, NULL, 0);
@ -903,14 +911,6 @@ ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***
return FAILURE;
}
/* The compiler is not-reentrant. Make sure we __autoload() only during run-time
* (doesn't impact fuctionality of __autoload()
*/
if (zend_is_compiling(TSRMLS_C)) {
free_alloca(lc_name);
return FAILURE;
}
ZVAL_STRINGL(&autoload_function, "__autoload", sizeof("__autoload")-1, 0);
INIT_PZVAL(class_name_ptr);