diff options
| author | Sascha Schumann <sas@php.net> | 2001-08-05 16:21:33 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-08-05 16:21:33 +0000 |
| commit | b349df63645e48eade0481238e6ca3feb90f18fa (patch) | |
| tree | d565c9fb1b058469cbbd2d248ea261c59ac6f5c4 /sapi | |
| parent | 373b3e101e0394f0727e1e5855e18e15851d0919 (diff) | |
| download | php-git-b349df63645e48eade0481238e6ca3feb90f18fa.tar.gz | |
some more eliminate-fetches-or-escalate-them-at-least
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 10 | ||||
| -rw-r--r-- | sapi/servlet/servlet.c | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 5e09d5a694..2ab43d3239 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -563,7 +563,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine case 'i': /* php info & quit */ if (php_request_startup(TSRMLS_C)==FAILURE) { - php_module_shutdown(); + php_module_shutdown(TSRMLS_C); return FAILURE; } if (no_headers) { @@ -611,7 +611,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine case 'v': /* show php version & quit */ no_headers = 1; if (php_request_startup(TSRMLS_C)==FAILURE) { - php_module_shutdown(); + php_module_shutdown(TSRMLS_C); return FAILURE; } if (no_headers) { @@ -668,7 +668,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine } if (php_request_startup(TSRMLS_C)==FAILURE) { - php_module_shutdown(); + php_module_shutdown(TSRMLS_C); return FAILURE; } if (no_headers) { @@ -714,7 +714,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine if(!argv0 || !(file_handle.handle.fp = VCWD_FOPEN(argv0, "rb"))) { PUTS("No input file specified.\n"); php_request_shutdown((void *) 0); - php_module_shutdown(); + php_module_shutdown(TSRMLS_C); return FAILURE; } file_handle.filename = argv0; @@ -782,7 +782,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine exit_status = -1; } zend_end_try(); - php_module_shutdown(); + php_module_shutdown(TSRMLS_C); #ifdef ZTS tsrm_shutdown(); diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index aaf4589b3f..1cb890bae3 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -269,7 +269,9 @@ JNIEXPORT void JNICALL Java_net_php_servlet_startup JNIEXPORT void JNICALL Java_net_php_servlet_shutdown (JNIEnv *jenv, jobject self) { - php_module_shutdown(); + TSRMLS_FETCH(); + + php_module_shutdown(TSRMLS_C); #ifdef ZTS tsrm_shutdown(); #endif @@ -361,7 +363,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send if (retval == FAILURE) { php_request_shutdown((void *) 0); - php_module_shutdown(); + php_module_shutdown(TSRMLS_C); ThrowIOException(jenv, file_handle.filename); return; } |