fix: preserve autoloading in worker mode

.gitignore

@@ -1,3 +1,4 @@
-.vscode/
 /caddy/frankenphp/frankenphp
 /internal/testserver/testserver
+.vscode/
+__debug_bin

frankenphp.c

@@ -83,6 +83,7 @@ typedef struct frankenphp_server_context {
 	uintptr_t current_request;
 	uintptr_t main_request; // Only available during worker initialization
 	char *cookie_data;
+	HashTable *autoload_functions;
 } frankenphp_server_context;
 
 // Adapted from php_request_shutdown
@@ -112,13 +113,13 @@ void frankenphp_worker_request_shutdown(uintptr_t current_request) {
 	} zend_end_try();
 	
 	/* 8. Destroy super-globals */
-	zend_try {
+	/*zend_try {
 		int i;
 
 		for (i=0; i<NUM_TRACK_VARS; i++) {
 			zval_ptr_dtor(&PG(http_globals)[i]);
 		}
-	} zend_end_try();
+	} zend_end_try();*/
 
 	/* 9. skipped: Shutdown scanner/executor/compiler and restore ini entries */
 
@@ -126,7 +127,7 @@ void frankenphp_worker_request_shutdown(uintptr_t current_request) {
 	// todo: check if it's a good idea
 	// php_free_request_globals()
 	// clear_last_error()
-	if (PG(last_error_message)) {
+	/*if (PG(last_error_message)) {
 		zend_string_release(PG(last_error_message));
 		PG(last_error_message) = NULL;
 	}
@@ -137,7 +138,7 @@ void frankenphp_worker_request_shutdown(uintptr_t current_request) {
 	if (PG(php_sys_temp_dir)) {
 		efree(PG(php_sys_temp_dir));
 		PG(php_sys_temp_dir) = NULL;
-	}
+	}*/
 
 	/* 11. Call all extensions post-RSHUTDOWN functions */
 	zend_try {
@@ -156,9 +157,9 @@ void frankenphp_worker_request_shutdown(uintptr_t current_request) {
 
 	/* 14. Destroy stream hashes */
 	// todo: check if it's a good idea
-	zend_try {
+	/*zend_try {
 		php_shutdown_stream_hashes();
-	} zend_end_try();
+	} zend_end_try();*/
 
 	/* 15. skipped: Free Willy (here be crashes) */
 
@@ -237,6 +238,46 @@ int frankenphp_worker_request_startup() {
 	return retval;
 }
 
+void save_autload_functions() {
+	zval retval = {0};
+	zend_fcall_info fci = {0};
+	zend_fcall_info_cache fci_cache = {0};
+
+	zend_string *func_name = zend_string_init(ZEND_STRL("spl_autoload_functions"), 0);
+	ZVAL_STR(&fci.function_name, func_name);
+
+	fci.size = sizeof fci;
+	fci.retval = &retval;
+
+	zend_call_function(&fci, &fci_cache);
+
+	zend_string_release(func_name);
+
+	((frankenphp_server_context *) SG(server_context))->autoload_functions = Z_ARRVAL_P(fci.retval);
+}
+
+void restore_autoload_functions() {
+	HashTable *functions = ((frankenphp_server_context *) SG(server_context))->autoload_functions;
+
+	zval *val;
+	zval retval = {0};
+	zend_fcall_info fci = {0};
+	zend_fcall_info_cache fci_cache = {0};
+
+	zend_string *func_name = zend_string_init(ZEND_STRL("spl_autoload_register"), 0);
+	ZVAL_STR(&fci.function_name, func_name);
+
+	fci.size = sizeof fci;
+	fci.retval = &retval;
+	fci.param_count = 1;
+
+	ZEND_HASH_FOREACH_VAL(functions, val) {
+		fci.params = val;
+
+		zend_call_function(&fci, &fci_cache);
+	} ZEND_HASH_FOREACH_END();
+}
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_frankenphp_handle_request, 0, 0, 1)
     ZEND_ARG_CALLABLE_INFO(false, handler, false)
 ZEND_END_ARG_INFO()
@@ -253,6 +294,9 @@ PHP_FUNCTION(frankenphp_handle_request) {
 
 	uintptr_t previous_request = ctx->current_request;
 	if (ctx->main_request) {
+		// Save the main autoloader
+		save_autload_functions();
+
 		// Clean the first dummy request created to initialize the worker
 		frankenphp_worker_request_shutdown(0);
 
@@ -274,6 +318,8 @@ PHP_FUNCTION(frankenphp_handle_request) {
 		RETURN_FALSE;
 	}
 
+	restore_autoload_functions();
+
 	// Call the PHP func
 	zval retval = {0};
 	fci.size = sizeof fci;

frankenphp_test.go

@@ -307,10 +307,28 @@ func testPersistentObject(t *testing.T, opts *testOptions) {
 		resp := w.Result()
 		body, _ := io.ReadAll(resp.Body)
 
-		assert.Equal(t, string(body), fmt.Sprintf(`request: %d
+		assert.Equal(t, fmt.Sprintf(`request: %d
 class exists: 1
 id: obj1
-object id: 1`, i))
+object id: 1`, i), string(body))
+	}, opts)
+}
+
+func TestAutoloader_module(t *testing.T) { testAutoloader(t, nil) }
+func TestAutoloader_worker(t *testing.T) {
+	testAutoloader(t, &testOptions{workerScript: "autoloader.php"})
+}
+func testAutoloader(t *testing.T, opts *testOptions) {
+	runTest(t, func(handler func(http.ResponseWriter, *http.Request), _ *httptest.Server, i int) {
+		req := httptest.NewRequest("GET", fmt.Sprintf("http://example.com/autoloader.php?i=%d", i), nil)
+		w := httptest.NewRecorder()
+		handler(w, req)
+
+		resp := w.Result()
+		body, _ := io.ReadAll(resp.Body)
+
+		assert.Equal(t, fmt.Sprintf(`request %d
+my_autoloader`, i), string(body))
 	}, opts)
 }
 

testdata/_executor.php

@@ -3,9 +3,9 @@
 $fn = require $_SERVER['SCRIPT_FILENAME'];
 if (!isset($_SERVER['FRANKENPHP_WORKER'])) {
     $fn();
-    return;
+    exit(0);
 }
 
 while (frankenphp_handle_request($fn)) {}
 
-return;
+exit(0);

testdata/autoloader-require.php

@@ -0,0 +1,5 @@
+<?php
+
+function my_autoloader(string $class) {
+}
+spl_autoload_register('my_autoloader');

testdata/autoloader.php

@@ -0,0 +1,9 @@
+<?php
+
+require_once __DIR__.'/_executor.php';
+require_once __DIR__.'/autoloader-require.php';
+
+return function () {
+    echo "request {$_GET['i']}\n";
+    echo implode(',', spl_autoload_functions());
+};