Browse Source

- Fixed bug #62947 (Unneccesary warnings on FPM)

pull/210/head
Jerome Loyet 13 years ago
parent
commit
72f3457161
  1. 1
      NEWS
  2. 10
      sapi/fpm/fpm/fpm_unix.c

1
NEWS

@ -34,6 +34,7 @@ PHP NEWS
. Fixed bug #62954 (startup problems fpm / php-fpm). (fat)
. Fixed bug #62886 (PHP-FPM may segfault/hang on startup). (fat)
. Fixed bug #63085 (Systemd integration and daemonize). (remi, fat)
. Fixed bug #62947 (Unneccesary warnings on FPM). (fat)
- OpenSSL:
. Implemented FR #61421 (OpenSSL signature verification missing RMD160,

10
sapi/fpm/fpm/fpm_unix.c

@ -121,16 +121,16 @@ static int fpm_unix_conf_wp(struct fpm_worker_pool_s *wp) /* {{{ */
}
} else { /* not root */
if (wp->config->user && *wp->config->user) {
zlog(ZLOG_WARNING, "[pool %s] 'user' directive is ignored when FPM is not running as root", wp->config->name);
zlog(ZLOG_NOTICE, "[pool %s] 'user' directive is ignored when FPM is not running as root", wp->config->name);
}
if (wp->config->group && *wp->config->group) {
zlog(ZLOG_WARNING, "[pool %s] 'group' directive is ignored when FPM is not running as root", wp->config->name);
zlog(ZLOG_NOTICE, "[pool %s] 'group' directive is ignored when FPM is not running as root", wp->config->name);
}
if (wp->config->chroot && *wp->config->chroot) {
zlog(ZLOG_WARNING, "[pool %s] 'chroot' directive is ignored when FPM is not running as root", wp->config->name);
zlog(ZLOG_NOTICE, "[pool %s] 'chroot' directive is ignored when FPM is not running as root", wp->config->name);
}
if (wp->config->process_priority != 64) {
zlog(ZLOG_WARNING, "[pool %s] 'process.priority' directive is ignored when FPM is not running as root", wp->config->name);
zlog(ZLOG_NOTICE, "[pool %s] 'process.priority' directive is ignored when FPM is not running as root", wp->config->name);
}
/* set up HOME and USER anyway */
@ -350,7 +350,7 @@ int fpm_unix_init_main() /* {{{ */
return -1;
}
} else {
zlog(ZLOG_WARNING, "'process.priority' directive is ignored when FPM is not running as root");
zlog(ZLOG_NOTICE, "'process.priority' directive is ignored when FPM is not running as root");
}
}

Loading…
Cancel
Save