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.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix GH-19798: XP_SOCKET XP_SSL: Incorrect condition for Win
This commit is contained in:
Jakub Zelenka
2025-10-23 15:22:21 +02:00
parent 42787fe1cc eef11e048d
commit 2a0931d347
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -75,6 +75,10 @@ PHP NEWS
. Partially fixed bug GH-16317 (SimpleXML does not allow __debugInfo() overrides
to work). (nielsdos)
- Streams:
. Fixed bug GH-19798: XP_SOCKET XP_SSL (Socket stream modules): Incorrect
condition for Win32/Win64. (Jakub Zelenka)
- Tidy:
. Fixed GH-19021 (improved tidyOptGetCategory detection).
(arjendekorte, David Carlier, Peter Kokot)

4
ext/openssl/xp_ssl.c
View File

@@ -2338,7 +2338,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;
@@ -2359,7 +2359,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 */

4
main/streams/xp_socket.c
View File

@@ -858,7 +858,7 @@ out:
static inline int php_tcp_sockop_accept(php_stream *stream, php_netstream_data_t *sock,
php_stream_xport_param *xparam STREAMS_DC)
{
int clisock;
php_socket_t clisock;
bool nodelay = 0;
zval *tmpzval = NULL;
@@ -879,7 +879,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));