tony2001 Tue Feb 20 19:19:14 2007 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/cli php_cli.c
Log:
don't call php_module_startup() directly, use startup functions
patch by Andrei Nigmatulin
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.313&r2=1.314&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.313 php-src/sapi/cgi/cgi_main.c:1.314
--- php-src/sapi/cgi/cgi_main.c:1.313 Tue Feb 20 09:09:47 2007
+++ php-src/sapi/cgi/cgi_main.c Tue Feb 20 19:19:14 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.313 2007/02/20 09:09:47 tony2001 Exp $ */
+/* $Id: cgi_main.c,v 1.314 2007/02/20 19:19:14 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -116,6 +116,7 @@
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"},
@@ -542,7 +543,7 @@
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;
@@ -1211,7 +1212,7 @@
cgi_sapi_module.additional_functions = additional_functions;
/* 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
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.167&r2=1.168&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.167 php-src/sapi/cli/php_cli.c:1.168
--- php-src/sapi/cli/php_cli.c:1.167 Tue Jan 23 20:02:29 2007
+++ php-src/sapi/cli/php_cli.c Tue Feb 20 19:19:14 2007
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.167 2007/01/23 20:02:29 helly Exp $ */
+/* $Id: php_cli.c,v 1.168 2007/02/20 19:19:14 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -710,7 +710,7 @@
#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.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
