Index: sapi/cgi/cgi_main.c
===================================================================
RCS file: /repository/php-src/sapi/cgi/cgi_main.c,v
retrieving revision 1.267.2.15.2.46
diff -u -r1.267.2.15.2.46 cgi_main.c
--- sapi/cgi/cgi_main.c	8 Aug 2007 23:51:57 -0000	1.267.2.15.2.46
+++ sapi/cgi/cgi_main.c	28 Aug 2007 11:28:19 -0000
@@ -1553,6 +1553,13 @@
 						}
 						php_print_info(0xFFFFFFFF TSRMLS_CC);
 						php_end_ob_buffers(1 TSRMLS_CC);
+						php_request_shutdown((void *) 0);
+						SG(server_context) = NULL;
+						php_module_shutdown(TSRMLS_C);
+						sapi_shutdown();
+#ifdef ZTS
+						tsrm_shutdown();
+#endif
 						exit(0);
 						break;
 
@@ -1571,6 +1578,11 @@
 					print_extensions(TSRMLS_C);
 					php_printf("\n");
 					php_end_ob_buffers(1 TSRMLS_CC);
+					php_module_shutdown(TSRMLS_C);
+					sapi_shutdown();
+#ifdef ZTS
+					tsrm_shutdown();
+#endif
 					exit(0);
 					break;
 
@@ -1601,6 +1613,13 @@
 						php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2007 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 #endif
 						php_end_ob_buffers(1 TSRMLS_CC);
+						php_request_shutdown((void *) 0);
+						SG(server_context) = NULL;
+						php_module_shutdown(TSRMLS_C);
+						sapi_shutdown();
+#ifdef ZTS
+						tsrm_shutdown();
+#endif
 						exit(0);
 						break;