mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Servlets work again! OK, so it crashes on shutdown, apparently trying to

Browse Source 
report a memory leak, but it is worth committing the progress so far.
This commit is contained in:
Sam Ruby 2000-02-01 16:25:43 +00:00
parent 131e3a06fb
commit e30b061a06
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sapi/servlet/servlet.c
View File

@ -85,6 +85,14 @@ typedef struct {
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 @@ JNIEXPORT void JNICALL Java_net_php_servlet_startup
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 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send
zend_file_handle file_handle;
char cwd[MAXPATHLEN+1];
jlong addr = 0;
SLS_FETCH();
PLS_FETCH();
CLS_FETCH();