diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-21 14:27:56 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-21 14:27:56 +0000 |
| commit | 336004f4bc72fb5f1a4f8c992d90673960d74856 (patch) | |
| tree | d80bc544f0c521734e82cccd5f8fbc81ce8a7e25 /sapi/apache/sapi_apache.c | |
| parent | 931ebe08d7af6f37cb3975dd6fec07449aff0a8f (diff) | |
| download | php-git-336004f4bc72fb5f1a4f8c992d90673960d74856.tar.gz | |
Improved bailout mechanism, supports nested bailouts a-la try..catch
Note: You may *not* return directly from a catch block
Diffstat (limited to 'sapi/apache/sapi_apache.c')
| -rw-r--r-- | sapi/apache/sapi_apache.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 90d47da7d6..ef05150842 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -89,12 +89,11 @@ 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); } - - if (setjmp(EG(bailout))!=0) { - return OK; + + zend_try { + php_end_ob_buffers(1); + php_header(); /* Make sure headers have been sent */ } - php_end_ob_buffers(1); - php_header(); /* Make sure headers have been sent */ return (OK); } /* }}} */ |