cvs: php4(PHP_4_3) /sapi/apache sapi_apache.c

moriyoshi Fri May 16 19:08:47 2003 EDT Modified files: (Branch: PHP_4_3) /php4/sapi/apache sapi_apache.c Log: MFH(r-1.43): fixed a syntax highlighter problem that happens when output buffering is turned on Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.40.4.1 php4/sapi/apache/sapi_apache.c:1.40.4.2 --- php4/sapi/apache/sapi_apache.c:1.40.4.1 Tue Dec 31 11:26:59 2002 +++ php4/sapi/apache/sapi_apache.c Fri May 16 19:08:47 2003 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.40.4.1 2002/12/31 16:26:59 sebastian Exp $ */ +/* $Id: sapi_apache.c,v 1.40.4.2 2003/05/16 23:08:47 moriyoshi Exp $ */ #include "php_apache_http.h" @@ -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 @@ 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 @@ php_request_shutdown(NULL); } zend_end_try(); - return (OK); + return retval; } /* }}} */