From: Antony Dovgal <tony2001@php.net>
Date: Tue, 20 Feb 2007 19:20:41 +0000 (+0000)
Subject: MFH: make use of startup hooks
X-Git-Tag: php-5.2.2RC1~349
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=748b6fdeb33ad3d9aec62cf0b14ca4fca719af67;p=php

MFH: make use of startup hooks
---

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 4b92e55df2..c1982fa863 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -119,6 +119,7 @@ static pid_t pgroup;
 
 static char *php_optarg = NULL;
 static int php_optind = 1;
+static zend_module_entry cgi_module_entry;
 
 static const opt_struct OPTIONS[] = {
 	{'a', 0, "interactive"},
@@ -567,7 +568,7 @@ static int sapi_cgi_deactivate(TSRMLS_D)
 
 static int php_cgi_startup(sapi_module_struct *sapi_module)
 {
-	if (php_module_startup(sapi_module, NULL, 0) == FAILURE) {
+	if (php_module_startup(sapi_module, &cgi_module_entry, 1) == FAILURE) {
 		return FAILURE;
 	}
 	return SUCCESS;
@@ -1262,7 +1263,7 @@ int main(int argc, char *argv[])
 	cgi_sapi_module.executable_location = argv[0];
 
 	/* startup after we get the above ini override se we get things right */
-	if (php_module_startup(&cgi_sapi_module, &cgi_module_entry, 1) == FAILURE) {
+	if (cgi_sapi_module.startup(&cgi_sapi_module) == FAILURE) {
 #ifdef ZTS
 		tsrm_shutdown();
 #endif
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index d48617ae46..71e13f26d0 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -698,7 +698,7 @@ int main(int argc, char *argv[])
 #endif
 
 	/* startup after we get the above ini override se we get things right */
-	if (php_module_startup(&cli_sapi_module, NULL, 0)==FAILURE) {
+	if (cli_sapi_module.startup(&cli_sapi_module)==FAILURE) {
 		/* there is no way to see if we must call zend_ini_deactivate()
 		 * since we cannot check if EG(ini_directives) has been initialised
 		 * because the executor's constructor does not set initialize it.