summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2007-04-15 23:06:08 +0000
committerfoobar <sniper@php.net>2007-04-15 23:06:08 +0000
commit2fe7267d53b41529efc150d6f95ca7300965f649 (patch)
treee4a911c0fe4fa8346f52a824b602e12d485eaed3
parenta40b6f5c4fb40ff55d6a39e8b6d677cf35d65b43 (diff)
downloadphp-git-2fe7267d53b41529efc150d6f95ca7300965f649.tar.gz
MFH: Simplify previous patch.
-rw-r--r--sapi/cgi/cgi_main.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index e4d0e52761..e8f277cfc3 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1738,16 +1738,13 @@ consult the installation file that came with this distribution, or visit \n\
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;