php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix GH-19798: XP_SOCKET XP_SSL: Incorrect condition for Win
This commit is contained in:
Jakub Zelenka
2025-10-23 15:26:05 +02:00
parent d378dce3e9 2a0931d347
commit 45451740e3
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@@ -10,6 +10,11 @@ PHP NEWS
. Fixed bug GH-20257 (mail() heap overflow with an empty message in lf mode).
(David Carlier)
- Streams:
. Fixed bug GH-19798: XP_SOCKET XP_SSL (Socket stream modules): Incorrect
condition for Win32/Win64. (Jakub Zelenka)
23 Oct 2025, PHP 8.5.0RC3
- Core:

4
ext/openssl/xp_ssl.c
View File

@@ -2219,7 +2219,7 @@ static int php_openssl_sockop_stat(php_stream *stream, php_stream_statbuf *ssb)
static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_netstream_data_t *sock,
php_stream_xport_param *xparam STREAMS_DC) /* {{{ */
{
int clisock;
php_socket_t clisock;
bool nodelay = 0;
zval *tmpzval = NULL;
@@ -2240,7 +2240,7 @@ static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_
&xparam->outputs.error_code,
nodelay);
if (clisock >= 0) {
if (clisock != SOCK_ERR) {
php_openssl_netstream_data_t *clisockdata = (php_openssl_netstream_data_t*) emalloc(sizeof(*clisockdata));
/* copy underlying tcp fields */

2
main/streams/xp_socket.c
View File

@@ -878,7 +878,7 @@ static inline int php_tcp_sockop_accept(php_stream *stream, php_netstream_data_t
&xparam->outputs.error_code,
nodelay);
if (clisock >= 0) {
if (clisock != SOCK_ERR) {
php_netstream_data_t *clisockdata = (php_netstream_data_t*) emalloc(sizeof(*clisockdata));
memcpy(clisockdata, sock, sizeof(*clisockdata));