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

PHP: compatibility with 8.0.0 RC1.

Browse Source 
This closes #474 PR on GitHub.
This commit is contained in:
Valentin Bartenev
2020-10-06 18:12:05 +03:00
parent 6ec0ff3596
commit 2821b3347c
4 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/nxt_php_sapi.c
View File

@@ -88,6 +88,9 @@ static void nxt_php_set_options(nxt_task_t *task, nxt_conf_value_t *options,
int type);
static nxt_int_t nxt_php_alter_option(nxt_str_t *name, nxt_str_t *value,
int type);
#ifdef NXT_PHP8
static void nxt_php_disable_functions(nxt_str_t *str);
#endif
static void nxt_php_disable(nxt_task_t *task, const char *type,
nxt_str_t *value, char **ptr, nxt_php_disable_t disable);
@@ -589,9 +592,13 @@ nxt_php_set_options(nxt_task_t *task, nxt_conf_value_t *options, int type)
}
if (nxt_str_eq(&name, "disable_functions", 17)) {
#ifdef NXT_PHP8
nxt_php_disable_functions(&value);
#else
nxt_php_disable(task, "function", &value,
&PG(disable_functions),
zend_disable_function);
#endif
continue;
}
@@ -680,6 +687,29 @@ nxt_php_alter_option(nxt_str_t *name, nxt_str_t *value, int type)
#endif
#ifdef NXT_PHP8
static void
nxt_php_disable_functions(nxt_str_t *str)
{
char *p;
p = nxt_malloc(str->length + 1);
if (nxt_slow_path(p == NULL)) {
return;
}
nxt_memcpy(p, str->start, str->length);
p[str->length] = '\0';
zend_disable_functions(p);
nxt_free(p);
}
#endif
static void
nxt_php_disable(nxt_task_t *task, const char *type, nxt_str_t *value,
char **ptr, nxt_php_disable_t disable)