diff options
| author | Remi Collet <remi@remirepo.net> | 2020-08-12 22:55:01 +0300 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-08-12 22:55:01 +0300 |
| commit | 21ac95f17e70f2f20fe8e2a99bbe9cc7328a6e62 (patch) | |
| tree | 42be6358f9b3fb5709f53097f7e62df752016ae6 /src | |
| parent | 09685e2b4143ec19afef7673a455cf7e4d1414b7 (diff) | |
| download | unit-21ac95f17e70f2f20fe8e2a99bbe9cc7328a6e62.tar.gz unit-21ac95f17e70f2f20fe8e2a99bbe9cc7328a6e62.tar.bz2 | |
PHP: compatibility with 8.0.0 Beta 1.
This closes #441 PR on GitHub.
Diffstat (limited to '')
| -rw-r--r-- | src/nxt_php_sapi.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c index 00671b4a..bc8341f4 100644 --- a/src/nxt_php_sapi.c +++ b/src/nxt_php_sapi.c @@ -28,6 +28,9 @@ #if PHP_VERSION_ID >= 70000 #define NXT_PHP7 1 #endif +#if PHP_VERSION_ID >= 80000 +#define NXT_PHP8 1 +#endif /* PHP 8 */ #ifndef TSRMLS_CC @@ -61,7 +64,9 @@ typedef struct { } nxt_php_run_ctx_t; -#ifdef NXT_PHP7 +#if NXT_PHP8 +typedef int (*nxt_php_disable_t)(const char *p, size_t size); +#elif NXT_PHP7 typedef int (*nxt_php_disable_t)(char *p, size_t size); #else typedef int (*nxt_php_disable_t)(char *p, uint TSRMLS_DC); @@ -105,11 +110,15 @@ nxt_inline void nxt_php_set_str(nxt_unit_request_info_t *req, const char *name, static void nxt_php_set_cstr(nxt_unit_request_info_t *req, const char *name, const char *str, uint32_t len, zval *track_vars_array TSRMLS_DC); static void nxt_php_register_variables(zval *track_vars_array TSRMLS_DC); +#if NXT_PHP8 +static void nxt_php_log_message(const char *message, int syslog_type_int); +#else #ifdef NXT_HAVE_PHP_LOG_MESSAGE_WITH_SYSLOG_TYPE static void nxt_php_log_message(char *message, int syslog_type_int); #else static void nxt_php_log_message(char *message TSRMLS_DC); #endif +#endif #ifdef NXT_PHP7 static size_t nxt_php_unbuffered_write(const char *str, @@ -1240,6 +1249,10 @@ nxt_php_set_cstr(nxt_unit_request_info_t *req, const char *name, } +#if NXT_PHP8 +static void +nxt_php_log_message(const char *message, int syslog_type_int) +#else #ifdef NXT_HAVE_PHP_LOG_MESSAGE_WITH_SYSLOG_TYPE static void nxt_php_log_message(char *message, int syslog_type_int) @@ -1247,6 +1260,7 @@ nxt_php_log_message(char *message, int syslog_type_int) static void nxt_php_log_message(char *message TSRMLS_DC) #endif +#endif { nxt_php_run_ctx_t *ctx; |