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

PHP: fixed compatibility with ZTS.

Browse Source 
This closes #184 issue on GitHub.
This commit is contained in:
Valentin Bartenev
2018-11-21 18:22:19 +03:00
parent 39cd4a9dee
commit adf22b6a0d
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
auto/modules/php
View File

@@ -111,7 +111,7 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then
#include <php_main.h> #include <php_main.h>
int main() { int main() {
php_request_startup(); php_module_startup(NULL, NULL, 0);
return 0; return 0;
}" }"

31
src/nxt_php_sapi.c
View File

@@ -45,19 +45,19 @@ static void nxt_php_set_options(nxt_task_t *task, nxt_conf_value_t *options,
int type); int type);
static nxt_int_t nxt_php_alter_option(nxt_str_t *name, nxt_str_t *value, static nxt_int_t nxt_php_alter_option(nxt_str_t *name, nxt_str_t *value,
int type); int type);
static int nxt_php_send_headers(sapi_headers_struct *sapi_headers); static int nxt_php_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC);
static char *nxt_php_read_cookies(void); static char *nxt_php_read_cookies(TSRMLS_D);
static void nxt_php_set_sptr(nxt_unit_request_info_t *req, const char *name, static void nxt_php_set_sptr(nxt_unit_request_info_t *req, const char *name,
nxt_unit_sptr_t *v, uint32_t len, zval *track_vars_array TSRMLS_DC); nxt_unit_sptr_t *v, uint32_t len, zval *track_vars_array TSRMLS_DC);
nxt_inline void nxt_php_set_str(nxt_unit_request_info_t *req, const char *name, nxt_inline void nxt_php_set_str(nxt_unit_request_info_t *req, const char *name,
nxt_str_t *s, zval *track_vars_array TSRMLS_DC); nxt_str_t *s, zval *track_vars_array TSRMLS_DC);
static void nxt_php_set_cstr(nxt_unit_request_info_t *req, const char *name, static void nxt_php_set_cstr(nxt_unit_request_info_t *req, const char *name,
char *str, uint32_t len, zval *track_vars_array TSRMLS_DC); char *str, uint32_t len, zval *track_vars_array TSRMLS_DC);
static void nxt_php_register_variables(zval *track_vars_array); static void nxt_php_register_variables(zval *track_vars_array TSRMLS_DC);
#ifdef NXT_HAVE_PHP_LOG_MESSAGE_WITH_SYSLOG_TYPE #ifdef NXT_HAVE_PHP_LOG_MESSAGE_WITH_SYSLOG_TYPE
static void nxt_php_log_message(char *message, int syslog_type_int); static void nxt_php_log_message(char *message, int syslog_type_int);
#else #else
static void nxt_php_log_message(char *message); static void nxt_php_log_message(char *message TSRMLS_DC);
#endif #endif
#ifdef NXT_PHP7 #ifdef NXT_PHP7
@@ -159,6 +159,9 @@ 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
static void ***tsrm_ls;
#endif
static nxt_int_t static nxt_int_t
@@ -262,6 +265,17 @@ nxt_php_init(nxt_task_t *task, nxt_common_app_conf_t *conf)
nxt_memcpy(index->start, c->index.start, c->index.length); nxt_memcpy(index->start, c->index.start, c->index.length);
} }
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
tsrm_ls = ts_resource(0);
#endif
#ifdef NXT_PHP7
#if defined(ZEND_SIGNALS) || PHP_MINOR_VERSION > 0
zend_signal_startup();
#endif
#endif
sapi_startup(&nxt_php_sapi_module); sapi_startup(&nxt_php_sapi_module);
if (c->options != NULL) { if (c->options != NULL) {
@@ -433,7 +447,8 @@ nxt_php_alter_option(nxt_str_t *name, nxt_str_t *value, int type)
if (ini_entry->on_modify if (ini_entry->on_modify
&& ini_entry->on_modify(ini_entry, cstr, value->length, && ini_entry->on_modify(ini_entry, cstr, value->length,
ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg1, ini_entry->mh_arg2,
ini_entry->mh_arg3, ZEND_INI_STAGE_ACTIVATE) ini_entry->mh_arg3, ZEND_INI_STAGE_ACTIVATE
TSRMLS_CC)
!= SUCCESS) != SUCCESS)
{ {
nxt_free(cstr); nxt_free(cstr);
@@ -573,7 +588,11 @@ nxt_php_request_handler(nxt_unit_request_info_t *req)
(char *) ctx->script.start); (char *) ctx->script.start);
} }
#if (NXT_PHP7)
if (nxt_slow_path(php_request_startup() == FAILURE)) { if (nxt_slow_path(php_request_startup() == FAILURE)) {
#else
if (nxt_slow_path(php_request_startup(TSRMLS_C) == FAILURE)) {
#endif
nxt_unit_req_debug(req, "php_request_startup() failed"); nxt_unit_req_debug(req, "php_request_startup() failed");
rc = NXT_UNIT_ERROR; rc = NXT_UNIT_ERROR;
@@ -915,7 +934,7 @@ static void
nxt_php_log_message(char *message, int syslog_type_int) nxt_php_log_message(char *message, int syslog_type_int)
#else #else
static void static void
nxt_php_log_message(char *message) nxt_php_log_message(char *message TSRMLS_DC)
#endif #endif
{ {
nxt_log(nxt_php_task, NXT_LOG_NOTICE, "php message: %s", message); nxt_log(nxt_php_task, NXT_LOG_NOTICE, "php message: %s", message);