From: Felipe Pena <felipe@php.net>
Date: Thu, 23 Jun 2011 00:25:54 +0000 (+0000)
Subject: - Fixed crash on startup
X-Git-Tag: php-5.4.0alpha2~109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10bea32e8dfb015d3eddf264009a77e5a3ea20df;p=php

- Fixed crash on startup
---

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 9441e810fd..547d9f2079 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1587,8 +1587,6 @@ int main(int argc, char *argv[])
 	char *fpm_prefix = NULL;
 	int test_conf = 0;
 
-	fcgi_init();
-
 #ifdef HAVE_SIGNAL_H
 #if defined(SIGPIPE) && defined(SIG_IGN)
 	signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE in standalone mode so
@@ -1605,6 +1603,8 @@ int main(int argc, char *argv[])
 	tsrm_ls = ts_resource(0);
 #endif
 
+	fcgi_init();
+
 	sapi_startup(&cgi_sapi_module);
 	cgi_sapi_module.php_ini_path_override = NULL;
 	cgi_sapi_module.php_ini_ignore_cwd = 1;