diff options
author | Remi Collet <remi@remirepo.net> | 2022-12-15 16:57:33 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2022-12-15 16:57:33 +0100 |
commit | 83819330b4353871a89f945a01c79d9de7ea6ee3 (patch) | |
tree | 5fb675bf4d45f3e40fb42b46d7607866ab16c17d /unit-php82.patch | |
parent | 1449f7d6d52eaeb26e0f3053180e54149417398f (diff) |
update to 1.29.0
drop patch merged upstream
Diffstat (limited to 'unit-php82.patch')
-rw-r--r-- | unit-php82.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/unit-php82.patch b/unit-php82.patch deleted file mode 100644 index abcfcf2..0000000 --- a/unit-php82.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e90451adbe213803ef5f456e7715a2a79d83dccd Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 2 Jun 2022 16:16:35 +0200 -Subject: [PATCH] fix php_module_startup call for PHP 8.2 - ---- - auto/modules/php | 4 ++++ - src/nxt_php_sapi.c | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/auto/modules/php b/auto/modules/php -index e92a67cd3..328cd8df2 100644 ---- a/auto/modules/php -+++ b/auto/modules/php -@@ -149,7 +149,11 @@ nxt_feature_test=" - #include <php_main.h> - - int main() { -+ #if PHP_VERSION_ID < 80200 - php_module_startup(NULL, NULL, 0); -+ #else -+ php_module_startup(NULL, NULL); -+ #endif - return 0; - }" - -diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c -index 68ef07eb1..dda3c1f21 100644 ---- a/src/nxt_php_sapi.c -+++ b/src/nxt_php_sapi.c -@@ -1150,7 +1150,11 @@ nxt_php_vcwd_chdir(nxt_unit_request_info_t *req, u_char *dir) - static int - nxt_php_startup(sapi_module_struct *sapi_module) - { -+#if PHP_VERSION_ID < 80200 - return php_module_startup(sapi_module, &nxt_php_unit_module, 1); -+#else -+ return php_module_startup(sapi_module, &nxt_php_unit_module); -+#endif - } - - |