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

PHP: fixed segfault on initialization.

Browse Source 
PHP SAPI can call log handler while initializing.  Particularly, that happens
if there's a problem in loading some extension specified in php.ini file.
On this stage server context is empty, so now nxt_thread_log_error() is used.
This commit is contained in:
Valentin Bartenev
2018-03-16 18:19:48 +03:00
parent f0df93ee3b
commit e254eecb77
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nxt_php_sapi.c
View File

@@ -38,11 +38,11 @@ static int nxt_php_startup(sapi_module_struct *sapi_module);
static int nxt_php_send_headers(sapi_headers_struct *sapi_headers); static int nxt_php_send_headers(sapi_headers_struct *sapi_headers);
static char *nxt_php_read_cookies(void); static char *nxt_php_read_cookies(void);
static void nxt_php_register_variables(zval *track_vars_array); static void nxt_php_register_variables(zval *track_vars_array);
static void nxt_php_log_message(char *message
#ifdef NXT_HAVE_PHP_LOG_MESSAGE_WITH_SYSLOG_TYPE #ifdef NXT_HAVE_PHP_LOG_MESSAGE_WITH_SYSLOG_TYPE
, int syslog_type_int static void nxt_php_log_message(char *message, int syslog_type_int);
#else
static void nxt_php_log_message(char *message);
#endif #endif
);
#ifdef NXT_PHP7 #ifdef NXT_PHP7
static size_t nxt_php_unbuffered_write(const char *str, static size_t nxt_php_unbuffered_write(const char *str,
@@ -766,16 +766,13 @@ nxt_php_register_variables(zval *track_vars_array TSRMLS_DC)
} }
static void
nxt_php_log_message(char *message
#ifdef NXT_HAVE_PHP_LOG_MESSAGE_WITH_SYSLOG_TYPE #ifdef NXT_HAVE_PHP_LOG_MESSAGE_WITH_SYSLOG_TYPE
, int syslog_type_int static void
nxt_php_log_message(char *message, int syslog_type_int)
#else
static void
nxt_php_log_message(char *message)
#endif #endif
)
{ {
nxt_php_run_ctx_t *ctx; nxt_thread_log_error(NXT_LOG_NOTICE, "php message: %s", message);
ctx = SG(server_context);
nxt_log(ctx->task, NXT_LOG_NOTICE, "php message: %s", message);
} }