Skip to content

Fix build with PHP 8.5.0 Beta2 #1649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix build with PHP 8.5.0 Beta2 #1649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/nxt_php_sapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,10 @@ static nxt_int_t nxt_php_alter_option(nxt_str_t *name, nxt_str_t *value,
#ifdef NXT_PHP8
static void nxt_php_disable_functions(nxt_str_t *str);
#endif
#if (PHP_VERSION_ID < 80500)
static void nxt_php_disable(nxt_task_t *task, const char *type,
nxt_str_t *value, char **ptr, nxt_php_disable_t disable);
#endif

static nxt_int_t nxt_php_dirname(const nxt_str_t *file, nxt_str_t *dir);
static void nxt_php_str_trim_trail(nxt_str_t *str, u_char t);
Expand Down Expand Up @@ -710,9 +712,11 @@ nxt_php_set_options(nxt_task_t *task, nxt_conf_value_t *options, int type)
}

if (nxt_str_eq(&name, "disable_classes", 15)) {
#if (PHP_VERSION_ID < 80500)
nxt_php_disable(task, "class", &value,
&PG(disable_classes),
zend_disable_class);
#endif
continue;
}
}
Expand Down Expand Up @@ -817,6 +821,8 @@ nxt_php_disable_functions(nxt_str_t *str)
#endif


#if (PHP_VERSION_ID < 80500)

static void
nxt_php_disable(nxt_task_t *task, const char *type, nxt_str_t *value,
char **ptr, nxt_php_disable_t disable)
Expand Down Expand Up @@ -868,6 +874,8 @@ nxt_php_disable(nxt_task_t *task, const char *type, nxt_str_t *value,
} while (c != '\0');
}

#endif


static nxt_int_t
nxt_php_dirname(const nxt_str_t *file, nxt_str_t *dir)
Expand Down