- Fixed bug #53527 (php-fpm --test doesn't set a valuable return value).

This commit is contained in:
Jérôme Loyet 2010-12-18 11:22:11 +00:00
parent 2070f153f9
commit e77d3268d7
4 changed files with 25 additions and 2 deletions

3
NEWS
View file

@ -56,6 +56,9 @@
- Phar Extension:
. Fixed bug #53541 (format string bug in ext/phar).
(crrodriguez at opensuse dot org, Ilia)
- PHP-FPM SAPI:
. Fixed bug #53527 (php-fpm --test doesn't set a valuable return value). (fat)
- SPL extension:
. Fixed bug #53515 (property_exists incorrect on ArrayObject null and 0

View file

@ -21,7 +21,20 @@
#include "fpm_stdio.h"
#include "zlog.h"
struct fpm_globals_s fpm_globals;
struct fpm_globals_s fpm_globals = {
.parent_pid = 0,
.argc = NULL,
.argv = NULL,
.config = NULL,
.prefix = NULL,
.running_children = 0,
.error_log_fd = 0,
.log_level = 0,
.listening_socket = 0,
.max_requests = 0,
.is_child = 0,
.test_successful = 0
};
int fpm_init(int argc, char **argv, char *config, char *prefix, int test_conf) /* {{{ */
{
@ -43,7 +56,12 @@ int fpm_init(int argc, char **argv, char *config, char *prefix, int test_conf) /
0 > fpm_sockets_init_main() ||
0 > fpm_worker_pool_init_main() ||
0 > fpm_event_init_main()) {
return -1;
if (fpm_globals.test_successful) {
exit(0);
} else {
return -1;
}
}
if (0 > fpm_conf_write_pid()) {

View file

@ -22,6 +22,7 @@ struct fpm_globals_s {
int listening_socket; /* for this child */
int max_requests; /* for this child */
int is_child;
int test_successful;
};
extern struct fpm_globals_s fpm_globals;

View file

@ -1218,6 +1218,7 @@ int fpm_conf_init_main(int test_conf) /* {{{ */
fpm_conf_dump();
}
zlog(ZLOG_NOTICE, "configuration file %s test is successful\n", fpm_globals.config);
fpm_globals.test_successful = 1;
return -1;
}