From: Antony Dovgal <tony2001@php.net>
Date: Tue, 8 Jun 2010 12:02:55 +0000 (+0000)
Subject: fix micro-memleaks (happened once per process)
X-Git-Tag: php-5.3.3RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8be1c1d4b0f754a5a2b4c54fe238b620a799e51;p=php

fix micro-memleaks (happened once per process)
---

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 4c7d020a50..da8fed108f 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1879,6 +1879,7 @@ consult the installation file that came with this distribution, or visit \n\
 							}
 							php_print_info(0xFFFFFFFF TSRMLS_CC);
 							php_request_shutdown((void *) 0);
+							fcgi_shutdown();
 							exit_status = 0;
 							goto out;
 
@@ -1900,6 +1901,7 @@ consult the installation file that came with this distribution, or visit \n\
 							print_extensions(TSRMLS_C);
 							php_printf("\n");
 							php_end_ob_buffers(1 TSRMLS_CC);
+							fcgi_shutdown();
 							exit_status = 0;
 							goto out;
 
@@ -1933,6 +1935,7 @@ consult the installation file that came with this distribution, or visit \n\
 							php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 #endif
 							php_request_shutdown((void *) 0);
+							fcgi_shutdown();
 							exit_status = 0;
 							goto out;
 
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index f02f93b0e6..2ee4539b2a 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1638,6 +1638,7 @@ int main(int argc, char *argv[])
 				print_extensions(TSRMLS_C);
 				php_printf("\n");
 				php_end_ob_buffers(1 TSRMLS_CC);
+				fcgi_shutdown();
 				exit_status = 0;
 				goto out;
 
@@ -1653,6 +1654,7 @@ int main(int argc, char *argv[])
 				SG(request_info).no_headers = 1;
 				php_print_info(0xFFFFFFFF TSRMLS_CC);
 				php_request_shutdown((void *) 0);
+				fcgi_shutdown();
 				exit_status = 0;
 				goto out;
 
@@ -1665,6 +1667,7 @@ int main(int argc, char *argv[])
 				SG(headers_sent) = 1;
 				php_cgi_usage(argv[0]);
 				php_end_ob_buffers(1 TSRMLS_CC);
+				fcgi_shutdown();
 				exit_status = 0;
 				goto out;
 
@@ -1684,6 +1687,7 @@ int main(int argc, char *argv[])
 				php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__,      get_zend_version());
 #endif
 				php_request_shutdown((void *) 0);
+				fcgi_shutdown();
 				exit_status = 0;
 				goto out;
 		}
@@ -1698,6 +1702,7 @@ int main(int argc, char *argv[])
 		php_cgi_usage(argv[0]);
 		php_end_ob_buffers(1 TSRMLS_CC);
 		exit_status = 0;
+		fcgi_shutdown();
 		goto out;
 	}