technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PHP: Fixed php_module_startup() call for PHP 8.2.

Browse Source 
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>
This commit is contained in:
Remi Collet
2022-06-02 16:16:35 +02:00
committed by Alejandro Colomar
parent f2213dbd1b
commit 48b6a7b311
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
auto/modules/php
View File

@@ -149,7 +149,11 @@ nxt_feature_test="
#include <php_main.h> #include <php_main.h>
int main() { int main() {
#if (PHP_VERSION_ID < 80200)
php_module_startup(NULL, NULL, 0); php_module_startup(NULL, NULL, 0);
#else
php_module_startup(NULL, NULL);
#endif
return 0; return 0;
}" }"

6
docs/changes.xml
View File

@@ -31,6 +31,12 @@ NGINX Unit updated to 1.29.0.
date="" time="" date="" time=""
packager="Nginx Packaging &lt;nginx-packaging@f5.com&gt;"> packager="Nginx Packaging &lt;nginx-packaging@f5.com&gt;">
<change type="feature">
<para>
compatibility with PHP 8.2.
</para>
</change>
<change type="feature"> <change type="feature">
<para> <para>
support rack v3 in ruby applications. support rack v3 in ruby applications.

4
src/nxt_php_sapi.c
View File

@@ -1150,7 +1150,11 @@ nxt_php_vcwd_chdir(nxt_unit_request_info_t *req, u_char *dir)
static int static int
nxt_php_startup(sapi_module_struct *sapi_module) nxt_php_startup(sapi_module_struct *sapi_module)
{ {
#if (PHP_VERSION_ID < 80200)
return php_module_startup(sapi_module, &nxt_php_unit_module, 1); return php_module_startup(sapi_module, &nxt_php_unit_module, 1);
#else
return php_module_startup(sapi_module, &nxt_php_unit_module);
#endif
} }