Merge branch 'master' of https://git.php.net/repository/php-src

1 files changed, 6 insertions, 0 deletions

diff --git a/win32/globals.c b/win32/globals.c
index dc7c9f8db4..69dc5ef232 100644
--- a/win32/globals.c
+++ b/win32/globals.c
@@ -32,6 +32,8 @@ void php_win32_core_globals_ctor(void *vg)
 {
 	php_win32_core_globals *wg = (php_win32_core_globals*)vg;
 	memset(wg, 0, sizeof(*wg));
+
+	wg->mail_socket = INVALID_SOCKET;
 }
 
 void php_win32_core_globals_dtor(void *vg)
@@ -51,6 +53,10 @@ void php_win32_core_globals_dtor(void *vg)
 		free(wg->registry_directories);
 		wg->registry_directories = NULL;
 	}
+
+	if (INVALID_SOCKET != wg->mail_socket) {
+		closesocket(wg->mail_socket);
+	}
 }