diff options
| author | Remi Collet <remi@remirepo.net> | 2022-06-02 16:16:35 +0200 |
|---|---|---|
| committer | Alejandro Colomar <alx@nginx.com> | 2022-10-19 12:59:49 +0200 |
| commit | 48b6a7b311272896be9212e170fcee8d1da25e79 (patch) | |
| tree | d3adebe03598ac40ccfab5d215cbfc0091e8d8c4 | |
| parent | f2213dbd1b51838ec6b59073d9d071a75def7858 (diff) | |
| download | unit-48b6a7b311272896be9212e170fcee8d1da25e79.tar.gz unit-48b6a7b311272896be9212e170fcee8d1da25e79.tar.bz2 | |
PHP: Fixed php_module_startup() call for PHP 8.2.
PHP 8.2 changed the prototype of the function, removing the last
parameter.
Signed-off-by: Remi Collet <remi@remirepo.net>
Cc: Timo Stark <t.stark@nginx.com>
Cc: George Peter Banyard <girgias@php.net>
Tested-by: Andy Postnikov <apostnikov@gmail.com>
Acked-by: Andy Postnikov <apostnikov@gmail.com>
Reviewed-by: Andrew Clayton <a.clayton@nginx.com>
Signed-off-by: Alejandro Colomar <alx@nginx.com>
Diffstat (limited to '')
| -rw-r--r-- | auto/modules/php | 4 | ||||
| -rw-r--r-- | docs/changes.xml | 6 | ||||
| -rw-r--r-- | src/nxt_php_sapi.c | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/auto/modules/php b/auto/modules/php index e92a67cd..7d224ec1 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/docs/changes.xml b/docs/changes.xml index 5da00d88..96877044 100644 --- a/docs/changes.xml +++ b/docs/changes.xml @@ -33,6 +33,12 @@ NGINX Unit updated to 1.29.0. <change type="feature"> <para> +compatibility with PHP 8.2. +</para> +</change> + +<change type="feature"> +<para> support rack v3 in ruby applications. </para> </change> diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c index 42fdbc68..b7eb29d1 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 } |