diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-17 12:19:39 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-17 12:19:39 +0200 |
| commit | 3a2fa489ddcb7557e6c55de7fb488e4f32031bde (patch) | |
| tree | 158cebe672eefa3bab656d1b124ccbf6422cd35b | |
| parent | f98684b06c67a93da0bca0adb5ff374c07aa4c6e (diff) | |
| parent | 252ebce0d7dc05695c6bfaad493e2626e1a2233f (diff) | |
| download | php-git-3a2fa489ddcb7557e6c55de7fb488e4f32031bde.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -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 1389b802fc..72e6db2e99 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -874,8 +874,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; } } @@ -897,8 +897,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; } } |