More cleanup

diff --git a/main/main.c b/main/main.c
index 329533de33b60fe9025191fdee0135cc072a798b..bd80ba0cdd0240d04e75466f3c667ca13547b39e 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -898,22 +898,16 @@ void php_module_shutdown()
        if (!module_initialized) {
                return;
        }
-#if !USE_SAPI
+
        /* close down the ini config */
        php_config_ini_shutdown();
-#endif
 
-#if (WIN32|WINNT) && !(USE_SAPI)
+#if (WIN32|WINNT)
        /*close winsock */
        WSACleanup();
 #endif
 
-#if CGI_BINARY
-       fflush(stdout);
-#endif
-#if 0                                                  /* SAPI */
-       sapi_rqst->flush(sapi_rqst->scid);
-#endif
+       sapi_flush();
 
        global_lock_destroy();
        zend_shutdown();