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

PHP: fixed php >= 7.4 with zts enabled.

Browse Source
This commit is contained in:
Tiago Natel de Moura
2020-02-25 15:55:31 +00:00
parent f519e31e2d
commit 98c0ce6cc4
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/nxt_php_sapi.c
View File

@@ -15,21 +15,19 @@
#include <nxt_unit_request.h> #include <nxt_unit_request.h>
#if PHP_MAJOR_VERSION >= 7 #if PHP_VERSION_ID >= 50400
# define NXT_PHP7 1 #define NXT_HAVE_PHP_IGNORE_CWD 1
# if PHP_MINOR_VERSION >= 1
# define NXT_HAVE_PHP_LOG_MESSAGE_WITH_SYSLOG_TYPE 1
# else
# define NXT_HAVE_PHP_INTERRUPTS 1
# endif
# define NXT_HAVE_PHP_IGNORE_CWD 1
#else
# define NXT_HAVE_PHP_INTERRUPTS 1
# if PHP_MINOR_VERSION >= 4
# define NXT_HAVE_PHP_IGNORE_CWD 1
# endif
#endif #endif
#if PHP_VERSION_ID >= 70100
#define NXT_HAVE_PHP_LOG_MESSAGE_WITH_SYSLOG_TYPE 1
#else
#define NXT_HAVE_PHP_INTERRUPTS 1
#endif
#if PHP_VERSION_ID >= 70000
#define NXT_PHP7 1
#endif
typedef struct nxt_php_run_ctx_s nxt_php_run_ctx_t; typedef struct nxt_php_run_ctx_s nxt_php_run_ctx_t;
@@ -172,7 +170,7 @@ NXT_EXPORT nxt_app_module_t nxt_app_module = {
static nxt_task_t *nxt_php_task; static nxt_task_t *nxt_php_task;
#ifdef ZTS #if defined(ZTS) && PHP_VERSION_ID < 70400
static void ***tsrm_ls; static void ***tsrm_ls;
#endif #endif
@@ -278,10 +276,16 @@ nxt_php_init(nxt_task_t *task, nxt_common_app_conf_t *conf)
} }
#ifdef ZTS #ifdef ZTS
#if PHP_VERSION_ID >= 70400
php_tsrm_startup();
#else
tsrm_startup(1, 1, 0, NULL); tsrm_startup(1, 1, 0, NULL);
tsrm_ls = ts_resource(0); tsrm_ls = ts_resource(0);
#endif #endif
#endif
#if defined(NXT_PHP7) && defined(ZEND_SIGNALS) #if defined(NXT_PHP7) && defined(ZEND_SIGNALS)
#if (NXT_ZEND_SIGNAL_STARTUP) #if (NXT_ZEND_SIGNAL_STARTUP)