diff options
| author | Drakano <drakano@arcor.de> | 2019-09-12 10:18:30 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-17 12:19:21 +0200 |
| commit | 252ebce0d7dc05695c6bfaad493e2626e1a2233f (patch) | |
| tree | d2ba9beeaaca128e0cfcfe00d0073c67a55ad833 | |
| parent | 29bced9521762ed935810b54a25cb74a09e25957 (diff) | |
| download | php-git-252ebce0d7dc05695c6bfaad493e2626e1a2233f.tar.gz | |
Add tilde to allowed status/ping path
Because of user specific webdirs it should be possible to set a
status/ping path like "/~username/status".
Closes GH-4698.
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 42ee60b36c..88959eebc6 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -873,8 +873,8 @@ static int fpm_conf_process_all_pools() /* {{{ */ } for (i = 0; i < strlen(status); i++) { - if (!isalnum(status[i]) && status[i] != '/' && status[i] != '-' && status[i] != '_' && status[i] != '.') { - zlog(ZLOG_ERROR, "[pool %s] the status path '%s' must contain only the following characters '[alphanum]/_-.'", wp->config->name, status); + if (!isalnum(status[i]) && status[i] != '/' && status[i] != '-' && status[i] != '_' && status[i] != '.' && status[i] != '~') { + zlog(ZLOG_ERROR, "[pool %s] the status path '%s' must contain only the following characters '[alphanum]/_-.~'", wp->config->name, status); return -1; } } @@ -896,8 +896,8 @@ static int fpm_conf_process_all_pools() /* {{{ */ } for (i = 0; i < strlen(ping); i++) { - if (!isalnum(ping[i]) && ping[i] != '/' && ping[i] != '-' && ping[i] != '_' && ping[i] != '.') { - zlog(ZLOG_ERROR, "[pool %s] the ping path '%s' must containt only the following characters '[alphanum]/_-.'", wp->config->name, ping); + if (!isalnum(ping[i]) && ping[i] != '/' && ping[i] != '-' && ping[i] != '_' && ping[i] != '.' && ping[i] != '~') { + zlog(ZLOG_ERROR, "[pool %s] the ping path '%s' must containt only the following characters '[alphanum]/_-.~'", wp->config->name, ping); return -1; } } |