diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 22:03:21 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 22:03:21 +0400 |
| commit | 4b09dd69e6bd31f4010bf48e9e07e63cb5f3c2a4 (patch) | |
| tree | ba61f22f1d9c12700d288bebe62a5cab3b6cb77a /ext/spl/php_spl.c | |
| parent | 412ad4b25417d261c0a8c43f788d5c110593d891 (diff) | |
| download | php-git-4b09dd69e6bd31f4010bf48e9e07e63cb5f3c2a4.tar.gz | |
Removed EG(active_op_array) and use corresponding value from EG(current_execute_data)
Diffstat (limited to 'ext/spl/php_spl.c')
| -rw-r--r-- | ext/spl/php_spl.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 5ec20cd563..2daeff6603 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -286,7 +286,6 @@ static int spl_autoload(zend_string *class_name, zend_string *lc_name, const cha } STR_RELEASE(opened_path); if (new_op_array) { - EG(active_op_array) = new_op_array; if (!EG(active_symbol_table)) { zend_rebuild_symbol_table(TSRMLS_C); } @@ -320,7 +319,6 @@ PHP_FUNCTION(spl_autoload) char *pos, *pos1; zend_string *class_name, *lc_name, *file_exts = SPL_G(autoload_extensions); zend_op **original_opline_ptr = EG(opline_ptr); - zend_op_array *original_active_op_array = EG(active_op_array); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|S", &class_name, &file_exts) == FAILURE) { RETURN_FALSE; @@ -338,7 +336,6 @@ PHP_FUNCTION(spl_autoload) zend_str_tolower_copy(lc_name->val, class_name->val, class_name->len); while (pos && *pos && !EG(exception)) { EG(opline_ptr) = original_opline_ptr; - EG(active_op_array) = original_active_op_array; pos1 = strchr(pos, ','); if (pos1) { pos1_len = pos1 - pos; @@ -355,7 +352,6 @@ PHP_FUNCTION(spl_autoload) STR_FREE(lc_name); EG(opline_ptr) = original_opline_ptr; - EG(active_op_array) = original_active_op_array; if (!found && !SPL_G(autoload_running)) { /* For internal errors, we generate E_ERROR, for direct calls an exception is thrown. |