diff options
| author | Zeev Suraski <zeev@php.net> | 2002-09-18 21:57:42 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2002-09-18 21:57:42 +0000 |
| commit | 76312b4508b43ed2cebd97b749e9e90181e55073 (patch) | |
| tree | de244c23b518eff0488eb3a965b21e2522ee0454 /sapi/servlet/servlet.c | |
| parent | 70f17979fb7ac0c7379a48bc86d26a009cfb56ed (diff) | |
| download | php-git-76312b4508b43ed2cebd97b749e9e90181e55073.tar.gz | |
another startup initialization fix - only ISAPI and CGI SAPI's tested,
minor compile buglets might occur in other SAPIs, but should be trivial
to fix...
Diffstat (limited to 'sapi/servlet/servlet.c')
| -rw-r--r-- | sapi/servlet/servlet.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index 727dd9fe94..538a603f8c 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -205,15 +205,25 @@ static char *sapi_servlet_read_cookies(TSRMLS_D) /***************************************************************************/ + /* * sapi maintenance */ +static int php_servlet_startup(sapi_module_struct *sapi_module) +{ + if (php_module_startup(sapi_module, NULL, 0)==FAILURE) { + return FAILURE; + } else { + return SUCCESS; + } +} + static sapi_module_struct servlet_sapi_module = { "java_servlet", /* name */ "Java Servlet", /* pretty name */ - php_module_startup, /* startup */ + php_servlet_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ NULL, /* activate */ @@ -253,16 +263,10 @@ JNIEXPORT void JNICALL Java_net_php_servlet_startup sapi_startup(&servlet_sapi_module); - if (php_module_startup(&servlet_sapi_module)==FAILURE) { + if (php_module_startup(&servlet_sapi_module, additional_php_extensions, EXTCOUNT)==FAILURE) { ThrowServletException(jenv,"module startup failure"); return; } - - if (php_startup_extensions(additional_php_extensions, EXTCOUNT)==FAILURE) { - ThrowServletException(jenv,"extension startup failure"); - return; - } - } |