Skip to content

Fixed GH-22216: don't warn in OnUpdateMemoryConsumption on ZTS thread init #22225

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
dkkoma wants to merge 1 commit into
base: PHP-8.5
Choose a base branch
from
+8 −1
Open

Fixed GH-22216: don't warn in OnUpdateMemoryConsumption on ZTS thread init #22225

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
5 changes: 5 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ PHP NEWS
Phar::addEmptyDir() for paths starting with "/.phar", while allowing
non-magic directory names that merely share the ".phar" prefix. (Weilin Du)

- Opcache:
. Fixed bug GH-22216 (spurious opcache.memory_consumption warning on each new
ZTS thread; the directive is also reported as 0 in worker threads).
(Daisuke Komazaki)

- Zlib:
. Fixed memory leak if deflate initialization fails and there is a dict.
(ndossche)
Expand Down
4 changes: 3 additions & 1 deletion ext/opcache/zend_accelerator_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ static int validate_api_restriction(void)

static ZEND_INI_MH(OnUpdateMemoryConsumption)
{
if (accel_startup_ok) {
/* On ZTS, each new thread runs the on_modify handlers at STAGE_STARTUP to
* populate its own globals; that is thread init, not a post-startup change. */
if (accel_startup_ok && stage != ZEND_INI_STAGE_STARTUP) {
if (strcmp(sapi_module.name, "fpm-fcgi") == 0) {
zend_accel_error(ACCEL_LOG_WARNING, "opcache.memory_consumption cannot be changed when OPcache is already set up. Are you using php_admin_value[opcache.memory_consumption] in an individual pool's configuration?\n");
} else {
Expand Down
Loading