Skip to content

wip(frankenphp.c): attempt to attach cli thread to existing TSRM #2343

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

Draft
burgesQ wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −2
Draft

wip(frankenphp.c): attempt to attach cli thread to existing TSRM #2343

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
19 changes: 17 additions & 2 deletions frankenphp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,7 +1381,18 @@ static void *execute_script_cli(void *arg) {
php_embed_module.pretty_name = "PHP CLI embedded in FrankenPHP";
php_embed_module.register_server_variables = sapi_cli_register_variables;

php_embed_init(cli_argc, cli_argv);
#ifdef ZTS
(void)ts_resource(0); // Attache thread to existing TSRM.
#ifdef PHP_WIN32
ZEND_TSRMLS_CACHE_UPDATE();
#endif
#endif

// php_request_startup instead of php_embed_init.
if (php_request_startup() == FAILURE) {
ts_free_thread();
return (void *)(intptr_t)1;
}

cli_register_file_handles();
zend_first_try {
Expand All @@ -1400,7 +1411,11 @@ static void *execute_script_cli(void *arg) {

exit_status = (void *)(intptr_t)EG(exit_status);

php_embed_shutdown();
php_request_shutdown(NULL); // Instead of php_embed_shutdown.

#ifdef ZTS
ts_free_thread(); // Cleanly detach.
#endif

return exit_status;
}
Expand Down
Loading