1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
From cecd5e36a067dda5365f7a4439b72bc5a061400d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 1 Jul 2020 08:01:13 +0200
Subject: [PATCH] fix #440 API change in PHP 8.0.0alpha1
---
src/nxt_php_sapi.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c
index 7ae8484d..8b611306 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,11 +64,15 @@ typedef struct {
} nxt_php_run_ctx_t;
+#ifdef NXT_PHP8
+typedef int (*nxt_php_disable_t)(const char *p, size_t size);
+#else
#ifdef 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);
#endif
+#endif
#if PHP_VERSION_ID < 70200
typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS);
@@ -105,11 +112,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);
+#ifdef 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,
@@ -1269,6 +1280,10 @@ nxt_php_set_cstr(nxt_unit_request_info_t *req, const char *name,
}
+#ifdef 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)
@@ -1276,6 +1291,7 @@ nxt_php_log_message(char *message, int syslog_type_int)
static void
nxt_php_log_message(char *message TSRMLS_DC)
#endif
+#endif
{
nxt_log(nxt_php_task, NXT_LOG_NOTICE, "php message: %s", message);
}
|
