Skip to content

Commit 7dff544

Browse files
committed
php#53: * fixes for 004-stream_socket_client_server.php
1 parent 6aa47a4 commit 7dff544

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

ext/openssl/xp_ssl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,6 +2307,8 @@ static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_
23072307

23082308
clisockdata->s.socket = clisock;
23092309
clisockdata->s.poll_event = NULL;
2310+
clisockdata->s.read_event = NULL;
2311+
clisockdata->s.write_event = NULL;
23102312
clisockdata->s.nonblocking_applied = false;
23112313
#ifdef __linux__
23122314
/* O_NONBLOCK is not inherited on Linux */

main/network_async.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,6 @@ ZEND_API int network_async_await_stream_socket(php_netstream_data_t *netdata, sh
258258
return -1;
259259
}
260260

261-
if (UNEXPECTED(poll_event == NULL)) {
262-
errno = ENOTSUP; // Stream doesn't support async operations
263-
return -1;
264-
}
265-
266261
// Convert timeval timeout to milliseconds for async waker
267262
zend_ulong timeout_ms = 0; // 0 means infinite timeout for async waker
268263
if (timeout != NULL) {

0 commit comments

Comments
 (0)