Skip to content

Fix GH-22214: Honor opcache.dups_fix for duplicate functions #23625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prateekbhujel wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+44 −1
Open

Fix GH-22214: Honor opcache.dups_fix for duplicate functions #23625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions ext/opcache/tests/gh22214.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
--TEST--
GH-22214: opcache.dups_fix is honored for duplicate functions
--EXTENSIONS--
opcache
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.dups_fix=1
--FILE--
<?php
file_put_contents(__DIR__ . "/gh22214.inc", <<<'PHP'
<?php
function test_gh22214() {
echo "test_gh22214 called\n";
}
class TestGh22214 {
public function hello() {
echo "TestGh22214 called\n";
}
}
PHP
);

include __DIR__ . "/gh22214.inc";
include __DIR__ . "/gh22214.inc";

test_gh22214();
(new TestGh22214())->hello();
?>
--CLEAN--
<?php
@unlink(__DIR__ . "/gh22214.inc");
?>
--EXPECT--
test_gh22214 called
TestGh22214 called
8 changes: 7 additions & 1 deletion ext/opcache/zend_accelerator_util_funcs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,13 @@ static zend_always_inline void _zend_accel_function_hash_copy(HashTable *target,
ZEND_ASSERT(p->key);
t = zend_hash_find_known_hash(target, p->key);
if (UNEXPECTED(t != NULL)) {
goto failure;
if (EXPECTED(ZSTR_LEN(p->key) > 0) && EXPECTED(ZSTR_VAL(p->key)[0] == 0)) {
/* Runtime definition key, keep old value */
continue;
} else if (UNEXPECTED(!ZCG(accel_directives).ignore_dups)) {
goto failure;
}
continue;
}
_zend_hash_append_ptr_ex(target, p->key, Z_PTR(p->val), 1);
if (UNEXPECTED(call_observers) && *ZSTR_VAL(p->key)) { // if not rtd key
Expand Down
Loading