php/archived-frankenphp
1
0
Fork 0
mirror of https://github.com/php/frankenphp.git synced 2026-03-24 00:52:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: let PHP handle basic auth. (#2142)

Browse Source 
I noticed that PHP likes to handle and free basic auth parameters
internally (see
[here](9f774e3a85/main/main.c (L2739))
and
[here](9f774e3a85/main/SAPI.c (L514-L525))).
This PR changes it so the basic auth header is forwarded to PHP instead
of resolving it in go.

I suspect that this might fix some crashes in shutdown functions (like
#2121 and #1841) since it allows us freeing the `request_info` after
shutdown is finished. I haven't been able to reproduce these crashes yet
though.
This commit is contained in:
Alexander Stecher
2026-01-26 10:42:32 +01:00
committed by GitHub
parent 07518a743c
commit 0c2a0105b5
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
frankenphp.c
View File

@@ -85,7 +85,11 @@ static void frankenphp_update_request_context() {
/* status It is not reset by zend engine, set it to 200. */
SG(sapi_headers).http_response_code = 200;
go_update_request_info(thread_index, &SG(request_info));
char *authorization_header =
go_update_request_info(thread_index, &SG(request_info));
/* let PHP handle basic auth */
php_handle_auth_data(authorization_header);
}
static void frankenphp_free_request_context() {
@@ -95,8 +99,6 @@ static void frankenphp_free_request_context() {
}
/* freed via thread.Unpin() */
SG(request_info).auth_password = NULL;
SG(request_info).auth_user = NULL;
SG(request_info).request_method = NULL;
SG(request_info).query_string = NULL;
SG(request_info).content_type = NULL;
@@ -187,9 +189,9 @@ static void frankenphp_worker_request_shutdown() {
zend_end_try();
/* SAPI related shutdown (free stuff) */
frankenphp_free_request_context();
zend_try { sapi_deactivate(); }
zend_end_try();
frankenphp_free_request_context();
zend_set_memory_limit(PG(memory_limit));
}
@@ -609,8 +611,8 @@ static zend_module_entry frankenphp_module = {
STANDARD_MODULE_PROPERTIES};
static void frankenphp_request_shutdown() {
frankenphp_free_request_context();
php_request_shutdown((void *)0);
frankenphp_free_request_context();
}
static int frankenphp_startup(sapi_module_struct *sapi_module) {
@@ -1055,8 +1057,7 @@ static int frankenphp_request_startup() {
return SUCCESS;
}
frankenphp_free_request_context();
php_request_shutdown((void *)0);
frankenphp_request_shutdown();
return FAILURE;
}