diff options
| author | Sascha Schumann <sas@php.net> | 2001-07-23 01:03:22 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-07-23 01:03:22 +0000 |
| commit | 36be1040ebdfbcf5dc7f266fb542649dd145d19f (patch) | |
| tree | 5a1c3e29009135910b6123620650a6d555b2061f /sapi/apache/sapi_apache.c | |
| parent | e5204748f77e67f32a9159c193abdc4cec52ee72 (diff) | |
| download | php-git-36be1040ebdfbcf5dc7f266fb542649dd145d19f.tar.gz | |
Use synchronous php_request_shutdown in the standard case and
let the pool cleanup function only become effective, when an
error has occured.
This fixes the problem that the request_conn was already dead
when the request_shutdown was reached.
Diffstat (limited to 'sapi/apache/sapi_apache.c')
| -rw-r--r-- | sapi/apache/sapi_apache.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 5d5a7fbc96..35d707d024 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -56,13 +56,14 @@ #include "ext/standard/php_standard.h" #include "util_script.h" #include "php_version.h" -/*#include "mod_php4.h"*/ +#include "mod_php4.h" /* {{{ apache_php_module_main */ int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC PLS_DC SLS_DC) { zend_file_handle file_handle; + APLS_FETCH(); if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { return FAILURE; @@ -90,10 +91,12 @@ int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC (void) php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); } + AP(in_request) = 0; + zend_try { - php_end_ob_buffers(1); - php_header(); /* Make sure headers have been sent */ + php_request_shutdown(NULL); } zend_end_try(); + return (OK); } /* }}} */ |