diff options
| author | Anatol Belski <ab@php.net> | 2018-03-27 14:20:53 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2018-03-27 14:47:42 +0200 |
| commit | b8cc7e3b529d863b6dd69bf15d32532664bb3c41 (patch) | |
| tree | e88d6a2be947153d04e99c9d9ee72a51caf52503 | |
| parent | 2602083b730a0ae16a3690cc3e183ecc40ed6da5 (diff) | |
| download | php-git-b8cc7e3b529d863b6dd69bf15d32532664bb3c41.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Do not set PR_SET_DUMPABLE by default
Do not set PR_SET_DUMPABLE by default
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 3 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.h | 1 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_unix.c | 2 | ||||
| -rw-r--r-- | sapi/fpm/www.conf.in | 6 |
4 files changed, 11 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 8ab120a4b6..b93cd15fe7 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -132,6 +132,7 @@ static struct ini_value_parser_s ini_fpm_pool_options[] = { { "listen.mode", &fpm_conf_set_string, WPO(listen_mode) }, { "listen.allowed_clients", &fpm_conf_set_string, WPO(listen_allowed_clients) }, { "process.priority", &fpm_conf_set_integer, WPO(process_priority) }, + { "process.dumpable", &fpm_conf_set_boolean, WPO(process_dumpable) }, { "pm", &fpm_conf_set_pm, WPO(pm) }, { "pm.max_children", &fpm_conf_set_integer, WPO(pm_max_children) }, { "pm.start_servers", &fpm_conf_set_integer, WPO(pm_start_servers) }, @@ -614,6 +615,7 @@ static void *fpm_worker_pool_config_alloc() /* {{{ */ wp->config->listen_backlog = FPM_BACKLOG_DEFAULT; wp->config->pm_process_idle_timeout = 10; /* 10s by default */ wp->config->process_priority = 64; /* 64 means unset */ + wp->config->process_dumpable = 0; wp->config->clear_env = 1; if (!fpm_worker_all_pools) { @@ -1646,6 +1648,7 @@ static void fpm_conf_dump() /* {{{ */ } else { zlog(ZLOG_NOTICE, "\tprocess.priority = %d", wp->config->process_priority); } + zlog(ZLOG_NOTICE, "\tprocess.dumpable = %s", BOOL2STR(wp->config->process_dumpable)); zlog(ZLOG_NOTICE, "\tpm = %s", PM2STR(wp->config->pm)); zlog(ZLOG_NOTICE, "\tpm.max_children = %d", wp->config->pm_max_children); zlog(ZLOG_NOTICE, "\tpm.start_servers = %d", wp->config->pm_start_servers); diff --git a/sapi/fpm/fpm/fpm_conf.h b/sapi/fpm/fpm/fpm_conf.h index d56fcc4e78..a0434b694d 100644 --- a/sapi/fpm/fpm/fpm_conf.h +++ b/sapi/fpm/fpm/fpm_conf.h @@ -64,6 +64,7 @@ struct fpm_worker_pool_config_s { char *listen_mode; char *listen_allowed_clients; int process_priority; + int process_dumpable; int pm; int pm_max_children; int pm_start_servers; diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c index 6089e3109e..44f8df3111 100644 --- a/sapi/fpm/fpm/fpm_unix.c +++ b/sapi/fpm/fpm/fpm_unix.c @@ -398,7 +398,7 @@ int fpm_unix_init_child(struct fpm_worker_pool_s *wp) /* {{{ */ } #ifdef HAVE_PRCTL - if (0 > prctl(PR_SET_DUMPABLE, 1, 0, 0, 0)) { + if (wp->config->process_dumpable && 0 > prctl(PR_SET_DUMPABLE, 1, 0, 0, 0)) { zlog(ZLOG_SYSERROR, "[pool %s] failed to prctl(PR_SET_DUMPABLE)", wp->config->name); } #endif diff --git a/sapi/fpm/www.conf.in b/sapi/fpm/www.conf.in index dccff163ba..ccfdbd9e87 100644 --- a/sapi/fpm/www.conf.in +++ b/sapi/fpm/www.conf.in @@ -69,6 +69,12 @@ listen = 127.0.0.1:9000 ; Default Value: no set ; process.priority = -19 +; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user +; or group is differrent than the master process user. It allows to create process +; core dump and ptrace the process for the pool user. +; Default Value: no +; process.dumpable = yes + ; Choose how the process manager will control the number of child processes. ; Possible Values: ; static - a fixed number (pm.max_children) of child processes; |