fat Sat, 08 Oct 2011 14:00:07 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=317900
Log:
- Backported from 5.4 branch (order fpm configuration items the same way in
php-fpm.conf.in, fpm_conf.h and fpm_conf.c)
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.h
U php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c 2011-10-08 13:57:31 UTC (rev 317899)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c 2011-10-08 14:00:07 UTC (rev 317900)
@@ -76,53 +76,59 @@
static int ini_lineno = 0;
static char *ini_include = NULL;
+/*
+ * Please keep the same order as in fpm_conf.h and in php-fpm.conf.in
+ */
static struct ini_value_parser_s ini_fpm_global_options[] = {
- { "emergency_restart_threshold", &fpm_conf_set_integer, GO(emergency_restart_threshold) },
- { "emergency_restart_interval", &fpm_conf_set_time, GO(emergency_restart_interval) },
- { "process_control_timeout", &fpm_conf_set_time, GO(process_control_timeout) },
- { "process.max", &fpm_conf_set_integer, GO(process_max) },
- { "daemonize", &fpm_conf_set_boolean, GO(daemonize) },
{ "pid", &fpm_conf_set_string, GO(pid_file) },
{ "error_log", &fpm_conf_set_string, GO(error_log) },
- { "log_level", &fpm_conf_set_log_level, GO(log_level) },
#ifdef HAVE_SYSLOG_H
{ "syslog.ident", &fpm_conf_set_string, GO(syslog_ident) },
{ "syslog.facility", &fpm_conf_set_syslog_facility, GO(syslog_facility) },
#endif
+ { "log_level", &fpm_conf_set_log_level, GO(log_level) },
+ { "emergency_restart_threshold", &fpm_conf_set_integer, GO(emergency_restart_threshold) },
+ { "emergency_restart_interval", &fpm_conf_set_time, GO(emergency_restart_interval) },
+ { "process_control_timeout", &fpm_conf_set_time, GO(process_control_timeout) },
+ { "process.max", &fpm_conf_set_integer, GO(process_max) },
+ { "daemonize", &fpm_conf_set_boolean, GO(daemonize) },
{ "rlimit_files", &fpm_conf_set_integer, GO(rlimit_files) },
{ "rlimit_core", &fpm_conf_set_rlimit_core, GO(rlimit_core) },
{ 0, 0, 0 }
};
+/*
+ * Please keep the same order as in fpm_conf.h and in php-fpm.conf.in
+ */
static struct ini_value_parser_s ini_fpm_pool_options[] = {
{ "prefix", &fpm_conf_set_string, WPO(prefix) },
{ "user", &fpm_conf_set_string, WPO(user) },
{ "group", &fpm_conf_set_string, WPO(group) },
- { "chroot", &fpm_conf_set_string, WPO(chroot) },
- { "chdir", &fpm_conf_set_string, WPO(chdir) },
- { "request_terminate_timeout", &fpm_conf_set_time, WPO(request_terminate_timeout) },
- { "request_slowlog_timeout", &fpm_conf_set_time, WPO(request_slowlog_timeout) },
- { "slowlog", &fpm_conf_set_string, WPO(slowlog) },
- { "rlimit_files", &fpm_conf_set_integer, WPO(rlimit_files) },
- { "rlimit_core", &fpm_conf_set_rlimit_core, WPO(rlimit_core) },
- { "catch_workers_output", &fpm_conf_set_boolean, WPO(catch_workers_output) },
{ "listen", &fpm_conf_set_string, WPO(listen_address) },
+ { "listen.backlog", &fpm_conf_set_integer, WPO(listen_backlog) },
{ "listen.owner", &fpm_conf_set_string, WPO(listen_owner) },
{ "listen.group", &fpm_conf_set_string, WPO(listen_group) },
{ "listen.mode", &fpm_conf_set_string, WPO(listen_mode) },
- { "listen.backlog", &fpm_conf_set_integer, WPO(listen_backlog) },
{ "listen.allowed_clients", &fpm_conf_set_string, WPO(listen_allowed_clients) },
{ "pm", &fpm_conf_set_pm, WPO(pm) },
- { "pm.max_requests", &fpm_conf_set_integer, WPO(pm_max_requests) },
{ "pm.max_children", &fpm_conf_set_integer, WPO(pm_max_children) },
{ "pm.start_servers", &fpm_conf_set_integer, WPO(pm_start_servers) },
{ "pm.min_spare_servers", &fpm_conf_set_integer, WPO(pm_min_spare_servers) },
{ "pm.max_spare_servers", &fpm_conf_set_integer, WPO(pm_max_spare_servers) },
+ { "pm.max_requests", &fpm_conf_set_integer, WPO(pm_max_requests) },
{ "pm.status_path", &fpm_conf_set_string, WPO(pm_status_path) },
{ "ping.path", &fpm_conf_set_string, WPO(ping_path) },
{ "ping.response", &fpm_conf_set_string, WPO(ping_response) },
{ "access.log", &fpm_conf_set_string, WPO(access_log) },
{ "access.format", &fpm_conf_set_string, WPO(access_format) },
+ { "slowlog", &fpm_conf_set_string, WPO(slowlog) },
+ { "request_slowlog_timeout", &fpm_conf_set_time, WPO(request_slowlog_timeout) },
+ { "request_terminate_timeout", &fpm_conf_set_time, WPO(request_terminate_timeout) },
+ { "rlimit_files", &fpm_conf_set_integer, WPO(rlimit_files) },
+ { "rlimit_core", &fpm_conf_set_rlimit_core, WPO(rlimit_core) },
+ { "chroot", &fpm_conf_set_string, WPO(chroot) },
+ { "chdir", &fpm_conf_set_string, WPO(chdir) },
+ { "catch_workers_output", &fpm_conf_set_boolean, WPO(catch_workers_output) },
{ "security.limit_extensions", &fpm_conf_set_string, WPO(security_limit_extensions) },
{ 0, 0, 0 }
};
@@ -568,13 +574,24 @@
struct key_value_s *kv, *kv_next;
free(wpc->name);
- free(wpc->pm_status_path);
- free(wpc->ping_path);
- free(wpc->ping_response);
+ free(wpc->prefix);
+ free(wpc->user);
+ free(wpc->group);
free(wpc->listen_address);
free(wpc->listen_owner);
free(wpc->listen_group);
free(wpc->listen_mode);
+ free(wpc->listen_allowed_clients);
+ free(wpc->pm_status_path);
+ free(wpc->ping_path);
+ free(wpc->ping_response);
+ free(wpc->access_log);
+ free(wpc->access_format);
+ free(wpc->slowlog);
+ free(wpc->chroot);
+ free(wpc->chdir);
+ free(wpc->security_limit_extensions);
+
for (kv = wpc->php_values; kv; kv = kv_next) {
kv_next = kv->next;
free(kv->key);
@@ -593,16 +610,6 @@
free(kv->value);
free(kv);
}
- free(wpc->listen_allowed_clients);
- free(wpc->user);
- free(wpc->group);
- free(wpc->chroot);
- free(wpc->chdir);
- free(wpc->slowlog);
- free(wpc->prefix);
- free(wpc->access_log);
- free(wpc->access_format);
- free(wpc->security_limit_extensions);
return 0;
}
@@ -679,6 +686,7 @@
for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
+ /* prefix */
if (wp->config->prefix && *wp->config->prefix) {
fpm_evaluate_full_path(&wp->config->prefix, NULL, NULL, 0);
@@ -688,6 +696,13 @@
}
}
+ /* user */
+ if (!wp->config->user) {
+ zlog(ZLOG_ALERT, "[pool %s] user has not been defined", wp->config->name);
+ return -1;
+ }
+
+ /* listen */
if (wp->config->listen_address && *wp->config->listen_address) {
wp->listen_address_domain = fpm_sockets_domain_from_address(wp->config->listen_address);
@@ -699,21 +714,19 @@
return -1;
}
- if (!wp->config->user) {
- zlog(ZLOG_ALERT, "[pool %s] user has not been defined", wp->config->name);
- return -1;
- }
-
+ /* pm */
if (wp->config->pm != PM_STYLE_STATIC && wp->config->pm != PM_STYLE_DYNAMIC) {
zlog(ZLOG_ALERT, "[pool %s] the process manager is missing (static or dynamic)", wp->config->name);
return -1;
}
+ /* pm.max_children */
if (wp->config->pm_max_children < 1) {
zlog(ZLOG_ALERT, "[pool %s] pm.max_children must be a positive value", wp->config->name);
return -1;
}
+ /* pm.start_servers, pm.min_spare_servers, pm.max_spare_servers */
if (wp->config->pm == PM_STYLE_DYNAMIC) {
struct fpm_worker_pool_config_s *config = wp->config;
@@ -749,40 +762,31 @@
}
- if (wp->config->slowlog && *wp->config->slowlog) {
- fpm_evaluate_full_path(&wp->config->slowlog, wp, NULL, 0);
- }
+ /* status */
+ if (wp->config->pm_status_path && *wp->config->pm_status_path) {
+ int i;
+ char *status = wp->config->pm_status_path;
+ /* struct fpm_status_s fpm_status; */
- if (wp->config->request_slowlog_timeout) {
-#if HAVE_FPM_TRACE
- if (! (wp->config->slowlog && *wp->config->slowlog)) {
- zlog(ZLOG_ERROR, "[pool %s] 'slowlog' must be specified for use with 'request_slowlog_timeout'", wp->config->name);
+ if (*status != '/') {
+ zlog(ZLOG_ERROR, "[pool %s] the status path '%s' must start with a '/'", wp->config->name, status);
return -1;
}
-#else
- static int warned = 0;
- if (!warned) {
- zlog(ZLOG_WARNING, "[pool %s] 'request_slowlog_timeout' is not supported on your system", wp->config->name);
- warned = 1;
+ if (strlen(status) < 2) {
+ zlog(ZLOG_ERROR, "[pool %s] the status path '%s' is not long enough", wp->config->name, status);
+ return -1;
}
- wp->config->request_slowlog_timeout = 0;
-#endif
-
- if (wp->config->slowlog && *wp->config->slowlog) {
- int fd;
-
- fd = open(wp->config->slowlog, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
-
- if (0 > fd) {
- zlog(ZLOG_SYSERROR, "open(%s) failed", wp->config->slowlog);
+ 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);
return -1;
}
- close(fd);
}
}
+ /* ping */
if (wp->config->ping_path && *wp->config->ping_path) {
char *ping = wp->config->ping_path;
int i;
@@ -819,36 +823,96 @@
}
}
- if (wp->config->pm_status_path && *wp->config->pm_status_path) {
- int i;
- char *status = wp->config->pm_status_path;
- /* struct fpm_status_s fpm_status; */
+ /* access.log, access.format */
+ if (wp->config->access_log && *wp->config->access_log) {
+ fpm_evaluate_full_path(&wp->config->access_log, wp, NULL, 0);
+ if (!wp->config->access_format) {
+ wp->config->access_format = strdup("%R - %u %t \"%m %r\" %s");
+ }
+ }
- if (*status != '/') {
- zlog(ZLOG_ERROR, "[pool %s] the status path '%s' must start with a '/'", wp->config->name, status);
+ /* slowlog */
+ if (wp->config->slowlog && *wp->config->slowlog) {
+ fpm_evaluate_full_path(&wp->config->slowlog, wp, NULL, 0);
+ }
+
+ /* request_slowlog_timeout */
+ if (wp->config->request_slowlog_timeout) {
+#if HAVE_FPM_TRACE
+ if (! (wp->config->slowlog && *wp->config->slowlog)) {
+ zlog(ZLOG_ERROR, "[pool %s] 'slowlog' must be specified for use with 'request_slowlog_timeout'", wp->config->name);
return -1;
}
+#else
+ static int warned = 0;
- if (strlen(status) < 2) {
- zlog(ZLOG_ERROR, "[pool %s] the status path '%s' is not long enough", wp->config->name, status);
- return -1;
+ if (!warned) {
+ zlog(ZLOG_WARNING, "[pool %s] 'request_slowlog_timeout' is not supported on your system", wp->config->name);
+ warned = 1;
}
- 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);
+ wp->config->request_slowlog_timeout = 0;
+#endif
+
+ if (wp->config->slowlog && *wp->config->slowlog) {
+ int fd;
+
+ fd = open(wp->config->slowlog, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
+
+ if (0 > fd) {
+ zlog(ZLOG_SYSERROR, "open(%s) failed", wp->config->slowlog);
return -1;
}
+ close(fd);
}
}
- if (wp->config->access_log && *wp->config->access_log) {
- fpm_evaluate_full_path(&wp->config->access_log, wp, NULL, 0);
- if (!wp->config->access_format) {
- wp->config->access_format = strdup("%R - %u %t \"%m %r\" %s");
+ /* chroot */
+ if (wp->config->chroot && *wp->config->chroot) {
+
+ fpm_evaluate_full_path(&wp->config->chroot, wp, NULL, 1);
+
+ if (*wp->config->chroot != '/') {
+ zlog(ZLOG_ERROR, "[pool %s] the chroot path '%s' must start with a '/'", wp->config->name, wp->config->chroot);
+ return -1;
}
+ if (!fpm_conf_is_dir(wp->config->chroot)) {
+ zlog(ZLOG_ERROR, "[pool %s] the chroot path '%s' does not exist or is not a directory", wp->config->name, wp->config->chroot);
+ return -1;
+ }
}
+ /* chdir */
+ if (wp->config->chdir && *wp->config->chdir) {
+
+ fpm_evaluate_full_path(&wp->config->chdir, wp, NULL, 0);
+
+ if (*wp->config->chdir != '/') {
+ zlog(ZLOG_ERROR, "[pool %s] the chdir path '%s' must start with a '/'", wp->config->name, wp->config->chdir);
+ return -1;
+ }
+
+ if (wp->config->chroot) {
+ char *buf;
+
+ spprintf(&buf, 0, "%s/%s", wp->config->chroot, wp->config->chdir);
+
+ if (!fpm_conf_is_dir(buf)) {
+ zlog(ZLOG_ERROR, "[pool %s] the chdir path '%s' within the chroot path '%s' ('%s') does not exist or is not a directory", wp->config->name, wp->config->chdir, wp->config->chroot, buf);
+ efree(buf);
+ return -1;
+ }
+
+ efree(buf);
+ } else {
+ if (!fpm_conf_is_dir(wp->config->chdir)) {
+ zlog(ZLOG_ERROR, "[pool %s] the chdir path '%s' does not exist or is not a directory", wp->config->name, wp->config->chdir);
+ return -1;
+ }
+ }
+ }
+
+ /* security.limit_extensions */
if (!wp->config->security_limit_extensions) {
wp->config->security_limit_extensions = strdup(".php");
}
@@ -899,48 +963,7 @@
}
}
- if (wp->config->chroot && *wp->config->chroot) {
-
- fpm_evaluate_full_path(&wp->config->chroot, wp, NULL, 1);
-
- if (*wp->config->chroot != '/') {
- zlog(ZLOG_ERROR, "[pool %s] the chroot path '%s' must start with a '/'", wp->config->name, wp->config->chroot);
- return -1;
- }
- if (!fpm_conf_is_dir(wp->config->chroot)) {
- zlog(ZLOG_ERROR, "[pool %s] the chroot path '%s' does not exist or is not a directory", wp->config->name, wp->config->chroot);
- return -1;
- }
- }
-
- if (wp->config->chdir && *wp->config->chdir) {
-
- fpm_evaluate_full_path(&wp->config->chdir, wp, NULL, 0);
-
- if (*wp->config->chdir != '/') {
- zlog(ZLOG_ERROR, "[pool %s] the chdir path '%s' must start with a '/'", wp->config->name, wp->config->chdir);
- return -1;
- }
-
- if (wp->config->chroot) {
- char *buf;
-
- spprintf(&buf, 0, "%s/%s", wp->config->chroot, wp->config->chdir);
-
- if (!fpm_conf_is_dir(buf)) {
- zlog(ZLOG_ERROR, "[pool %s] the chdir path '%s' within the chroot path '%s' ('%s') does not exist or is not a directory", wp->config->name, wp->config->chdir, wp->config->chroot, buf);
- efree(buf);
- return -1;
- }
-
- efree(buf);
- } else {
- if (!fpm_conf_is_dir(wp->config->chdir)) {
- zlog(ZLOG_ERROR, "[pool %s] the chdir path '%s' does not exist or is not a directory", wp->config->name, wp->config->chdir);
- return -1;
- }
- }
- }
+ /* env[], php_value[], php_admin_values[] */
if (!wp->config->chroot) {
struct key_value_s *kv;
char *options[] = FPM_PHP_INI_TO_EXPAND;
@@ -1391,19 +1414,22 @@
{
struct fpm_worker_pool_s *wp;
+ /*
+ * Please keep the same order as in fpm_conf.h and in php-fpm.conf.in
+ */
zlog(ZLOG_NOTICE, "[General]");
zlog(ZLOG_NOTICE, "\tpid = %s", STR2STR(fpm_global_config.pid_file));
- zlog(ZLOG_NOTICE, "\tdaemonize = %s", BOOL2STR(fpm_global_config.daemonize));
zlog(ZLOG_NOTICE, "\terror_log = %s", STR2STR(fpm_global_config.error_log));
- zlog(ZLOG_NOTICE, "\tlog_level = %s", zlog_get_level_name(fpm_globals.log_level));
#ifdef HAVE_SYSLOG_H
zlog(ZLOG_NOTICE, "\tsyslog.ident = %s", STR2STR(fpm_global_config.syslog_ident));
zlog(ZLOG_NOTICE, "\tsyslog.facility = %d", fpm_global_config.syslog_facility); /* FIXME: convert to string */
#endif
+ zlog(ZLOG_NOTICE, "\tlog_level = %s", zlog_get_level_name(fpm_globals.log_level));
+ zlog(ZLOG_NOTICE, "\temergency_restart_interval = %ds", fpm_global_config.emergency_restart_interval);
+ zlog(ZLOG_NOTICE, "\temergency_restart_threshold = %d", fpm_global_config.emergency_restart_threshold);
zlog(ZLOG_NOTICE, "\tprocess_control_timeout = %ds", fpm_global_config.process_control_timeout);
zlog(ZLOG_NOTICE, "\tprocess.max = %d", fpm_global_config.process_max);
- zlog(ZLOG_NOTICE, "\temergency_restart_interval = %ds", fpm_global_config.emergency_restart_interval);
- zlog(ZLOG_NOTICE, "\temergency_restart_threshold = %d", fpm_global_config.emergency_restart_threshold);
+ zlog(ZLOG_NOTICE, "\tdaemonize = %s", BOOL2STR(fpm_global_config.daemonize));
zlog(ZLOG_NOTICE, "\trlimit_files = %d", fpm_global_config.rlimit_files);
zlog(ZLOG_NOTICE, "\trlimit_core = %d", fpm_global_config.rlimit_core);
zlog(ZLOG_NOTICE, " ");
@@ -1415,8 +1441,6 @@
zlog(ZLOG_NOTICE, "\tprefix = %s", STR2STR(wp->config->prefix));
zlog(ZLOG_NOTICE, "\tuser = %s", STR2STR(wp->config->user));
zlog(ZLOG_NOTICE, "\tgroup = %s", STR2STR(wp->config->group));
- zlog(ZLOG_NOTICE, "\tchroot = %s", STR2STR(wp->config->chroot));
- zlog(ZLOG_NOTICE, "\tchdir = %s", STR2STR(wp->config->chdir));
zlog(ZLOG_NOTICE, "\tlisten = %s", STR2STR(wp->config->listen_address));
zlog(ZLOG_NOTICE, "\tlisten.backlog = %d", wp->config->listen_backlog);
zlog(ZLOG_NOTICE, "\tlisten.owner = %s", STR2STR(wp->config->listen_owner));
@@ -1425,21 +1449,23 @@
zlog(ZLOG_NOTICE, "\tlisten.allowed_clients = %s", STR2STR(wp->config->listen_allowed_clients));
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.max_requests = %d", wp->config->pm_max_requests);
zlog(ZLOG_NOTICE, "\tpm.start_servers = %d", wp->config->pm_start_servers);
zlog(ZLOG_NOTICE, "\tpm.min_spare_servers = %d", wp->config->pm_min_spare_servers);
zlog(ZLOG_NOTICE, "\tpm.max_spare_servers = %d", wp->config->pm_max_spare_servers);
+ zlog(ZLOG_NOTICE, "\tpm.max_requests = %d", wp->config->pm_max_requests);
zlog(ZLOG_NOTICE, "\tpm.status_path = %s", STR2STR(wp->config->pm_status_path));
zlog(ZLOG_NOTICE, "\tping.path = %s", STR2STR(wp->config->ping_path));
zlog(ZLOG_NOTICE, "\tping.response = %s", STR2STR(wp->config->ping_response));
zlog(ZLOG_NOTICE, "\taccess.log = %s", STR2STR(wp->config->access_log));
zlog(ZLOG_NOTICE, "\taccess.format = %s", STR2STR(wp->config->access_format));
- zlog(ZLOG_NOTICE, "\tcatch_workers_output = %s", BOOL2STR(wp->config->catch_workers_output));
+ zlog(ZLOG_NOTICE, "\tslowlog = %s", STR2STR(wp->config->slowlog));
+ zlog(ZLOG_NOTICE, "\trequest_slowlog_timeout = %ds", wp->config->request_slowlog_timeout);
zlog(ZLOG_NOTICE, "\trequest_terminate_timeout = %ds", wp->config->request_terminate_timeout);
- zlog(ZLOG_NOTICE, "\trequest_slowlog_timeout = %ds", wp->config->request_slowlog_timeout);
- zlog(ZLOG_NOTICE, "\tslowlog = %s", STR2STR(wp->config->slowlog));
zlog(ZLOG_NOTICE, "\trlimit_files = %d", wp->config->rlimit_files);
zlog(ZLOG_NOTICE, "\trlimit_core = %d", wp->config->rlimit_core);
+ zlog(ZLOG_NOTICE, "\tchroot = %s", STR2STR(wp->config->chroot));
+ zlog(ZLOG_NOTICE, "\tchdir = %s", STR2STR(wp->config->chdir));
+ zlog(ZLOG_NOTICE, "\tcatch_workers_output = %s", BOOL2STR(wp->config->catch_workers_output));
zlog(ZLOG_NOTICE, "\tsecurity.limit_extensions = %s", wp->config->security_limit_extensions);
for (kv = wp->config->env; kv; kv = kv->next) {
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.h
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.h 2011-10-08 13:57:31 UTC (rev 317899)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.h 2011-10-08 14:00:07 UTC (rev 317900)
@@ -18,55 +18,61 @@
char *value;
};
+/*
+ * Please keep the same order as in fpm_conf.c and in php-fpm.conf.in
+ */
struct fpm_global_config_s {
- int emergency_restart_threshold;
- int emergency_restart_interval;
- int process_control_timeout;
- int daemonize;
char *pid_file;
char *error_log;
- int log_level;
#ifdef HAVE_SYSLOG_H
char *syslog_ident;
int syslog_facility;
#endif
+ int log_level;
+ int emergency_restart_threshold;
+ int emergency_restart_interval;
+ int process_control_timeout;
+ int process_max;
+ int daemonize;
int rlimit_files;
int rlimit_core;
- int process_max;
};
extern struct fpm_global_config_s fpm_global_config;
+/*
+ * Please keep the same order as in fpm_conf.c and in php-fpm.conf.in
+ */
struct fpm_worker_pool_config_s {
char *name;
char *prefix;
char *user;
char *group;
- char *chroot;
- char *chdir;
- int request_terminate_timeout;
- int request_slowlog_timeout;
- char *slowlog;
- int rlimit_files;
- int rlimit_core;
- int catch_workers_output;
+ char *listen_address;
+ int listen_backlog;
+ char *listen_owner;
+ char *listen_group;
+ char *listen_mode;
+ char *listen_allowed_clients;
int pm;
int pm_max_children;
- char *pm_status_path;
- int pm_max_requests;
int pm_start_servers;
int pm_min_spare_servers;
int pm_max_spare_servers;
+ int pm_max_requests;
+ char *pm_status_path;
char *ping_path;
char *ping_response;
char *access_log;
char *access_format;
- char *listen_address;
- int listen_backlog;
- char *listen_owner;
- char *listen_group;
- char *listen_mode;
- char *listen_allowed_clients;
+ char *slowlog;
+ int request_slowlog_timeout;
+ int request_terminate_timeout;
+ int rlimit_files;
+ int rlimit_core;
+ char *chroot;
+ char *chdir;
+ int catch_workers_output;
char *security_limit_extensions;
struct key_value_s *env;
struct key_value_s *php_admin_values;
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in 2011-10-08 13:57:31 UTC (rev 317899)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in 2011-10-08 14:00:07 UTC (rev 317900)
@@ -116,6 +116,12 @@
; Default Value: none
;prefix = /path/to/pools/$pool
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+; will be used.
+user = @php_fpm_user@
+group = @php_fpm_group@
+
; The address on which to accept FastCGI requests.
; Valid syntaxes are:
; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on
@@ -129,14 +135,6 @@
; Set listen(2) backlog. A value of '-1' means unlimited.
; Default Value: 128 (-1 on FreeBSD and OpenBSD)
;listen.backlog = -1
-
-; List of ipv4 addresses of FastCGI clients which are allowed to connect.
-; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
-; must be separated by a comma. If this value is left blank, connections will be
-; accepted from any ip address.
-; Default Value: any
-;listen.allowed_clients = 127.0.0.1
; Set permissions for unix socket, if one is used. In Linux, read/write
; permissions must be set in order to allow connections from a web server. Many
@@ -146,13 +144,15 @@
;listen.owner = @php_fpm_user@
;listen.group = @php_fpm_group@
;listen.mode = 0666
+
+; List of ipv4 addresses of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+;listen.allowed_clients = 127.0.0.1
-; Unix user/group of processes
-; Note: The user is mandatory. If the group is not set, the default user's group
-; will be used.
-user = @php_fpm_user@
-group = @php_fpm_group@
-
; Choose how the process manager will control the number of child processes.
; Possible Values:
; static - a fixed number (pm.max_children) of child processes;
@@ -379,12 +379,10 @@
; Default: "%R - %u %t \"%m %r\" %s"
;access.format = %R - %u %t "%m %r%Q%q" %s %f %{mili}d %{kilo}M %C%%
-; The timeout for serving a single request after which the worker process will
-; be killed. This option should be used when the 'max_execution_time' ini option
-; does not stop script execution for some reason. A value of '0' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_terminate_timeout = 0
+; The log file for slow requests
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
+;slowlog = log/$pool.log.slow
; The timeout for serving a single request after which a PHP backtrace will be
; dumped to the 'slowlog' file. A value of '0s' means 'off'.
@@ -392,10 +390,12 @@
; Default Value: 0
;request_slowlog_timeout = 0
-; The log file for slow requests
-; Default Value: not set
-; Note: slowlog is mandatory if request_slowlog_timeout is set
-;slowlog = log/$pool.log.slow
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
; Set open file descriptor rlimit.
; Default Value: system defined value
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
