clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source
This commit is contained in:
Xinchen Hui 2015-12-23 07:48:16 -08:00
commit 086eb8c88d
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/spl/php_spl.c
View File

@ -417,11 +417,17 @@ PHP_FUNCTION(spl_autoload_call)
}
if (SPL_G(autoload_functions)) {
HashPosition pos;
zend_ulong num_idx;
int l_autoload_running = SPL_G(autoload_running);
SPL_G(autoload_running) = 1;
lc_name = zend_string_alloc(Z_STRLEN_P(class_name), 0);
zend_str_tolower_copy(ZSTR_VAL(lc_name), Z_STRVAL_P(class_name), Z_STRLEN_P(class_name));
ZEND_HASH_FOREACH_STR_KEY_PTR(SPL_G(autoload_functions), func_name, alfi) {
zend_hash_internal_pointer_reset_ex(SPL_G(autoload_functions), &pos);
while (zend_hash_get_current_key_ex(SPL_G(autoload_functions), &func_name, &num_idx, &pos) == HASH_KEY_IS_STRING) {
if ((alfi = zend_hash_get_current_data_ptr_ex(SPL_G(autoload_functions), &pos)) == NULL) {
continue;
}
zend_call_method(Z_ISUNDEF(alfi->obj)? NULL : &alfi->obj, alfi->ce, &alfi->func_ptr, ZSTR_VAL(func_name), ZSTR_LEN(func_name), retval, 1, class_name, NULL);
zend_exception_save();
if (retval) {
@ -431,7 +437,8 @@ PHP_FUNCTION(spl_autoload_call)
if (zend_hash_exists(EG(class_table), lc_name)) {
break;
}
} ZEND_HASH_FOREACH_END();
zend_hash_move_forward_ex(SPL_G(autoload_functions), &pos);
}
zend_exception_restore();
zend_string_free(lc_name);
SPL_G(autoload_running) = l_autoload_running;

38
ext/spl/tests/bug71202.phpt Normal file
View File

@ -0,0 +1,38 @@
--TEST--
Bug #71202 (Autoload function registered by another not activated immediately)
--FILE--
<?php
function inner_autoload ($name){
if ($name == 'A') {
class A {
function __construct(){
echo "okey, ";
}
}
} else {
class B {
function __construct() {
die("error");
}
}
}
}
spl_autoload_register(function ($name) {
if ($name == 'A') {
spl_autoload_register("inner_autoload");
} else {
spl_autoload_unregister("inner_autoload");
}
});
$c = new A();
try {
$c = new B();
} catch (Error $e) {
echo "done";
}
?>
--EXPECT--
okey, done