Skip to content

Fix GH-22567 (Windows ZTS CLI SAPI should refresh its TSRMLS cache during request activation) #22568

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

Closed
matyhtf wants to merge 1 commit into from
Closed

Fix GH-22567 (Windows ZTS CLI SAPI should refresh its TSRMLS cache during request activation) #22568

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
11 changes: 10 additions & 1 deletion sapi/cli/php_cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,15 @@ static void sapi_cli_log_message(const char *message, int syslog_type_int) /* {{
}
/* }}} */

static int sapi_cli_activate(void) /* {{{ */
{
#if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_UPDATE();
#endif
return SUCCESS;
}
/* }}} */
Comment on lines +355 to +362

@jorgsowa jorgsowa Aug 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
static int sapi_cli_activate(void) /* {{{ */
{
#if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_UPDATE();
#endif
return SUCCESS;
}
/* }}} */
static int sapi_cli_activate(void)
{
#if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_UPDATE();
#endif
return SUCCESS;
}

Those brackets are not necessary anymore


static int sapi_cli_deactivate(void) /* {{{ */
{
fflush(stdout);
Expand Down Expand Up @@ -416,7 +425,7 @@ static sapi_module_struct cli_sapi_module = {
php_cli_startup, /* startup */
php_module_shutdown_wrapper, /* shutdown */

NULL, /* activate */
sapi_cli_activate, /* activate */
sapi_cli_deactivate, /* deactivate */

sapi_cli_ub_write, /* unbuffered write */
Expand Down
Loading