tony2001 Tue, 08 Jun 2010 12:02:55 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300270
Log:
fix micro-memleaks (happened once per process)
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c
U php/php-src/trunk/sapi/cgi/cgi_main.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
Modified: php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c 2010-06-08 10:55:12 UTC
(rev 300269)
+++ php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c 2010-06-08 12:02:55 UTC
(rev 300270)
@@ -1879,6 +1879,7 @@
}
php_print_info(0xFFFFFFFF TSRMLS_CC);
php_request_shutdown((void *) 0);
+ fcgi_shutdown();
exit_status = 0;
goto out;
@@ -1900,6 +1901,7 @@
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 @@
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;
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c 2010-06-08
10:55:12 UTC (rev 300269)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c 2010-06-08
12:02:55 UTC (rev 300270)
@@ -1638,6 +1638,7 @@
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 @@
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 @@
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 @@
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 @@
php_cgi_usage(argv[0]);
php_end_ob_buffers(1 TSRMLS_CC);
exit_status = 0;
+ fcgi_shutdown();
goto out;
}
Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===================================================================
--- php/php-src/trunk/sapi/cgi/cgi_main.c 2010-06-08 10:55:12 UTC (rev
300269)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c 2010-06-08 12:02:55 UTC (rev
300270)
@@ -1876,6 +1876,7 @@
}
php_print_info(0xFFFFFFFF TSRMLS_CC);
php_request_shutdown((void *) 0);
+ fcgi_shutdown();
exit_status = 0;
goto out;
@@ -1895,6 +1896,7 @@
print_extensions(TSRMLS_C);
php_printf("\n");
php_output_end_all(TSRMLS_C);
+ fcgi_shutdown();
exit_status = 0;
goto out;
@@ -1928,6 +1930,7 @@
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;
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c 2010-06-08 10:55:12 UTC (rev
300269)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c 2010-06-08 12:02:55 UTC (rev
300270)
@@ -1638,6 +1638,7 @@
php_printf("\n");
php_output_end_all(TSRMLS_C);
php_output_deactivate(TSRMLS_C);
+ fcgi_shutdown();
exit_status = 0;
goto out;
@@ -1653,6 +1654,7 @@
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 @@
php_cgi_usage(argv[0]);
php_output_end_all(TSRMLS_C);
php_output_deactivate(TSRMLS_C);
+ fcgi_shutdown();
exit_status = 0;
goto out;
@@ -1684,12 +1687,13 @@
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;
}
}
- /* No other args are permitted here as there is not interactive mode */
+ /* No other args are permitted here as there is no interactive mode */
if (argc != php_optind) {
cgi_sapi_module.startup(&cgi_sapi_module);
php_output_activate(TSRMLS_C);
@@ -1697,6 +1701,7 @@
php_cgi_usage(argv[0]);
php_output_end_all(TSRMLS_C);
php_output_deactivate(TSRMLS_C);
+ fcgi_shutdown();
exit_status = 0;
goto out;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
