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.

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 42ee60b36cce58d13d1b14003888328cd3f43d4d..88959eebc669c2d8e6bc76251d92cb94ab9c0cc3 100644 (file)
--- 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;
                                }
                        }