MFH: shutdown crypt correctly and fix memleak in ZTS mode

ext/standard/basic_functions.c

@@ -4108,7 +4108,6 @@ PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
 	basic_globals_dtor(&basic_globals TSRMLS_CC);
 #ifdef PHP_WIN32
 	php_win32_core_globals_dtor(&the_php_win32_core_globals TSRMLS_CC);
-	PHP_MSHUTDOWN(crypt);
 #endif
 #endif
 
@@ -4129,6 +4128,7 @@ PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
 #if defined(HAVE_LOCALECONV) && defined(ZTS)
 	PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
 #endif
+	PHP_MSHUTDOWN(crypt)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
 
 	return SUCCESS;
 }

ext/standard/crypt.c

@@ -107,15 +107,16 @@ PHP_MINIT_FUNCTION(crypt) /* {{{ */
 
 	return SUCCESS;
 }
+/* }}} */
 
-#ifdef PHP_USE_PHP_CRYPT_R
-PHP_MSHUTDOWN_FUNCTION(crypt)
+PHP_MSHUTDOWN_FUNCTION(crypt) /* {{{ */
 {
+#ifdef PHP_USE_PHP_CRYPT_R
 	php_shutdown_crypt_r();
+#endif
 
 	return SUCCESS;
 }
-#endif
 /* }}} */
 
 static unsigned char itoa64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";

ext/standard/php_crypt.h

@@ -26,9 +26,7 @@
 PHP_FUNCTION(crypt);
 #if HAVE_CRYPT
 PHP_MINIT_FUNCTION(crypt);
-#if PHP_WIN32
 PHP_MSHUTDOWN_FUNCTION(crypt);
-#endif
 PHP_RINIT_FUNCTION(crypt);
 #endif