Better leak fix for cgi -s / -w

We also need to go through request shutdown. The naming is a bit
confusing, but it's fine to go through fastcgi_request_done even
if not using fastcgi. Whether we loop or not is checked separately.

Author: nikic

sapi/cgi/cgi_main.c

@@ -2568,22 +2568,16 @@ consult the installation file that came with this distribution, or visit \n\
 				case PHP_MODE_STRIP:
 					if (open_file_for_scanning(&file_handle) == SUCCESS) {
 						zend_strip();
-						zend_file_handle_dtor(&file_handle);
 					}
-					goto parent_out;
+					break;
 				case PHP_MODE_HIGHLIGHT:
 					{
 						zend_syntax_highlighter_ini syntax_highlighter_ini;
 
 						if (open_file_for_scanning(&file_handle) == SUCCESS) {
 							php_get_highlight_struct(&syntax_highlighter_ini);
 							zend_highlight(&syntax_highlighter_ini);
-							if (fastcgi) {
-								goto fastcgi_request_done;
-							}
-							zend_file_handle_dtor(&file_handle);
 						}
-						goto parent_out;
 					}
 					break;
 			}