Skip to content

Incorrect SOCKETS_G(wsa_info) memory deallocation Win32 #20940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
EdmondDantes wants to merge 2 commits into from
+8 −4
Closed

Incorrect SOCKETS_G(wsa_info) memory deallocation Win32 #20940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f6a5c8
Update versions for PHP 8.5.1
edorian Dec 16, 2025
86c96b4
Fix WSA protocol info cleanup in request shutdown
EdmondDantes Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Zend/zend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef ZEND_H
#define ZEND_H

#define ZEND_VERSION "4.5.1-dev"
#define ZEND_VERSION "4.5.1"

#define ZEND_ENGINE_3

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dnl Basic autoconf initialization, generation of config.nice.
dnl ----------------------------------------------------------------------------

AC_PREREQ([2.68])
AC_INIT([PHP],[8.5.1-dev],[https://github.com/php/php-src/issues],[php],[https://www.php.net])
AC_INIT([PHP],[8.5.1],[https://github.com/php/php-src/issues],[php],[https://www.php.net])
AC_CONFIG_SRCDIR([main/php_version.h])
AC_CONFIG_AUX_DIR([build])
AC_PRESERVE_HELP_ORDER
Expand Down
4 changes: 4 additions & 0 deletions ext/sockets/sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,10 @@ static PHP_RSHUTDOWN_FUNCTION(sockets)
SOCKETS_G(strerror_buf) = NULL;
}

#ifdef PHP_WIN32
zend_hash_clean(&SOCKETS_G(wsa_info));
#endif

return SUCCESS;
}
/* }}} */
Expand Down
4 changes: 2 additions & 2 deletions main/php_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 8
#define PHP_MINOR_VERSION 5
#define PHP_RELEASE_VERSION 1
#define PHP_EXTRA_VERSION "-dev"
#define PHP_VERSION "8.5.1-dev"
#define PHP_EXTRA_VERSION ""
#define PHP_VERSION "8.5.1"
#define PHP_VERSION_ID 80501
Loading