diff options
| author | Jani Taskinen <jani@php.net> | 2010-03-12 10:28:59 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2010-03-12 10:28:59 +0000 |
| commit | af49e58f5155383a440041c77cc1ecbaf507fde7 (patch) | |
| tree | 01ffe64d6f78450fb828f73d0e1e59f3cc7c8c76 /sapi/apache/sapi_apache.c | |
| parent | ea539c8b88c9278363b6de0b39446e4e8e043391 (diff) | |
| download | php-git-af49e58f5155383a440041c77cc1ecbaf507fde7.tar.gz | |
- Reverted r296062 and r296065
Diffstat (limited to 'sapi/apache/sapi_apache.c')
| -rw-r--r-- | sapi/apache/sapi_apache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 1d58c0b5db..895463b2e7 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -27,7 +27,7 @@ */ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) { - int retval = OK; + int retval = OK; zend_file_handle file_handle; if (php_request_startup(TSRMLS_C) == FAILURE) { @@ -35,7 +35,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) } /* sending a file handle to another dll is not working so let zend open it. */ - + if (display_source_mode) { zend_syntax_highlighter_ini syntax_highlighter_ini; @@ -54,11 +54,11 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) } AP(in_request) = 0; - + zend_try { php_request_shutdown(NULL); } zend_end_try(); - + return retval; } /* }}} */ |