MFH(r-1.43): fixed a syntax highlighter problem that happens when output buffering...

diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index 69d9dc2f738790bc2cb5405a837026892034fab0..8b651de012788f47a563bb35179efd8d6911a1ec 100644 (file)
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -27,6 +27,7 @@
  */
 int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC)
 {
+       int retval = OK;        
        zend_file_handle file_handle;
 
        if (php_request_startup(TSRMLS_C) == FAILURE) {
@@ -40,10 +41,8 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC)
                zend_syntax_highlighter_ini syntax_highlighter_ini;
 
                php_get_highlight_struct(&syntax_highlighter_ini);
-               if (highlight_file(SG(request_info).path_translated, &syntax_highlighter_ini TSRMLS_CC)){
-                       return OK;
-               } else {
-                       return NOT_FOUND;
+               if (highlight_file(SG(request_info).path_translated, &syntax_highlighter_ini TSRMLS_CC) != SUCCESS) {
+                       retval = NOT_FOUND;
                }
        } else {
                file_handle.type = ZEND_HANDLE_FILENAME;
@@ -61,7 +60,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC)
                php_request_shutdown(NULL);
        } zend_end_try();
        
-       return (OK);
+       return retval;
 }
 /* }}} */