cvs: /php4/sapi/servlet servlet.c

rubys Tue Feb 1 17:26:12 2000 EDT Modified files: /php4/sapi/servlet servlet.c Log: Servlets work again! OK, so it crashes on shutdown, apparently trying to report a memory leak, but it is worth committing the progress so far. Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.11 php4/sapi/servlet/servlet.c:1.12 --- php4/sapi/servlet/servlet.c:1.11 Fri Jan 28 18:24:53 2000 +++ php4/sapi/servlet/servlet.c Tue Feb 1 17:25:42 2000 @@ -85,6 +85,14 @@ char *cookies; } servlet_request; +extern zend_module_entry java_module_entry; + +static zend_module_entry *additional_php_extensions[] = { + &java_module_entry +}; + +#define EXTCOUNT (sizeof(additional_php_extensions)/sizeof(zend_module_entry *)) + /***************************************************************************/ /* @@ -252,15 +260,20 @@ ThrowServletException(jenv,"module startup failure"); return; } + + if (php_startup_extensions(additional_php_extensions, EXTCOUNT)==FAILURE) { + ThrowServletException(jenv,"extension startup failure"); + return; + } + } JNIEXPORT void JNICALL Java_net_php_servlet_shutdown (JNIEnv *jenv, jobject self) { - SLS_FETCH(); - php_module_shutdown(); + php_global_shutdown_extensions(additional_php_extensions, EXTCOUNT); #ifdef ZTS tsrm_shutdown(); #endif @@ -304,7 +317,6 @@ zend_file_handle file_handle; char cwd[MAXPATHLEN+1]; - jlong addr = 0; SLS_FETCH(); PLS_FETCH(); CLS_FETCH();