]> granicus.if.org Git - php/commitdiff
MFH: Simplify previous patch.
authorfoobar <sniper@php.net>
Sun, 15 Apr 2007 23:06:08 +0000 (23:06 +0000)
committerfoobar <sniper@php.net>
Sun, 15 Apr 2007 23:06:08 +0000 (23:06 +0000)
sapi/cgi/cgi_main.c

index e4d0e5276131413377228d0812b819ce4353a66a..e8f277cfc358aecbe7599455ae9982de9ae9381f 100644 (file)
@@ -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;