From b0e32bc015f8eb146e745b7184549e15c6657f85 Mon Sep 17 00:00:00 2001
From: Valentin Bartenev <vbart@nginx.com>
Date: Fri, 7 May 2021 07:46:25 +0300
Subject: PHP: forced initialization of $_SERVER in fastcgi_finish_request().

The "auto_globals_jit" PHP option postponed the initialization of the $_SERVER
global variable until the script using it had been loaded (e. g. via the
"include" expression).  As a result, nxt_php_register_variables() could be
called after fastcgi_finish_request() had finished the request and nulled
ctx->req, which thus caused a segmentation fault.
---
 src/nxt_php_sapi.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'src/nxt_php_sapi.c')

diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c
index 8fbe7f65..23c148c8 100644
--- a/src/nxt_php_sapi.c
+++ b/src/nxt_php_sapi.c
@@ -163,7 +163,8 @@ static const zend_function_entry  nxt_php_ext_functions[] = {
 };
 
 
-zif_handler  nxt_php_chdir_handler;
+zif_handler       nxt_php_chdir_handler;
+zend_auto_global  *nxt_php_server_ag;
 
 
 static zend_module_entry  nxt_php_unit_module = {
@@ -211,6 +212,7 @@ ZEND_NAMED_FUNCTION(nxt_php_chdir)
 
 PHP_FUNCTION(fastcgi_finish_request)
 {
+    zend_auto_global   *ag;
     nxt_php_run_ctx_t  *ctx;
 
     if (nxt_slow_path(zend_parse_parameters_none() == FAILURE)) {
@@ -240,6 +242,16 @@ PHP_FUNCTION(fastcgi_finish_request)
     php_header(TSRMLS_C);
 #endif
 
+    ag = nxt_php_server_ag;
+
+    if (ag->armed) {
+#ifdef NXT_PHP7
+        ag->armed = ag->auto_global_callback(ag->name);
+#else
+        ag->armed = ag->auto_global_callback(ag->name, ag->name_len TSRMLS_CC);
+#endif
+    }
+
     nxt_unit_request_done(ctx->req, NXT_UNIT_OK);
     ctx->req = NULL;
 
@@ -411,6 +423,19 @@ nxt_php_setup(nxt_task_t *task, nxt_process_t *process,
         nxt_php_set_options(task, value, ZEND_INI_USER);
     }
 
+#ifdef NXT_PHP7
+    nxt_php_server_ag = zend_hash_str_find_ptr(CG(auto_globals), "_SERVER",
+                                               nxt_length("_SERVER"));
+#else
+    zend_hash_quick_find(CG(auto_globals), "_SERVER", sizeof("_SERVER"),
+                         zend_hash_func("_SERVER", sizeof("_SERVER")),
+                         (void **) &nxt_php_server_ag);
+#endif
+    if (nxt_slow_path(nxt_php_server_ag == NULL)) {
+        nxt_alert(task, "failed to find $_SERVER auto global");
+        return NXT_ERROR;
+    }
+
     return NXT_OK;
 }
 
-- 
cgit 


From 539551c89f4028ed70e5881400fc9151af3d12e8 Mon Sep 17 00:00:00 2001
From: Valentin Bartenev <vbart@nginx.com>
Date: Fri, 21 May 2021 14:41:35 +0300
Subject: PHP: adopted "file_handle" to Zend API changes in 8.1.0-dev.

This fixes building module with the development version of PHP after the change:
https://github.com/php/php-src/commit/c732ab400af92c54eee47c487a56009f1d79dd5d
---
 src/nxt_php_sapi.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/nxt_php_sapi.c')

diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c
index 23c148c8..3fb3b0db 100644
--- a/src/nxt_php_sapi.c
+++ b/src/nxt_php_sapi.c
@@ -1101,10 +1101,20 @@ nxt_php_execute(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r)
     nxt_memzero(&file_handle, sizeof(file_handle));
 
     file_handle.type = ZEND_HANDLE_FILENAME;
+#if (PHP_VERSION_ID >= 80100)
+    file_handle.filename = zend_string_init((char *) ctx->script_filename.start,
+                                            ctx->script_filename.length, 0);
+    file_handle.primary_script = 1;
+#else
     file_handle.filename = (char *) ctx->script_filename.start;
+#endif
 
     php_execute_script(&file_handle TSRMLS_CC);
 
+#if (PHP_VERSION_ID >= 80100)
+    zend_destroy_file_handle(&file_handle);
+#endif
+
     /* Prevention of consuming possible unread request body. */
 #if (PHP_VERSION_ID < 50600)
     read_post = sapi_module.read_post;
-- 
cgit