cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c

sniper Sun Apr 15 23:06:08 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/cgi cgi_main.c Log: MFH: Simplify previous patch. http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.33&r2=1.267.2.15.2.34&diff_format=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.33 php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.34 --- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.33 Sun Apr 15 22:52:07 2007 +++ php-src/sapi/cgi/cgi_main.c Sun Apr 15 23:06:08 2007 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.267.2.15.2.33 2007/04/15 22:52:07 sniper Exp $ */ +/* $Id: cgi_main.c,v 1.267.2.15.2.34 2007/04/15 23:06:08 sniper Exp $ */ #include "php.h" #include "php_globals.h" @@ -1738,16 +1738,13 @@ php_get_highlight_struct(&syntax_highlighter_ini); zend_highlight(&syntax_highlighter_ini TSRMLS_CC); #if PHP_FASTCGI - if (!fastcgi) -#endif - { - fclose(file_handle.handle.fp); - php_end_ob_buffers(1 TSRMLS_CC); + if (fastcgi) { + goto fastcgi_request_done; } - } -#if PHP_FASTCGI - if (!fastcgi) #endif + fclose(file_handle.handle.fp); + php_end_ob_buffers(1 TSRMLS_CC); + } return SUCCESS; } break;