socket_connect() maps a provider timeout like the emulated wait, TLS accept sets the restore flag, two stale comments

Author: bukka

ext/openssl/xp_ssl.c

@@ -3528,6 +3528,8 @@ static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_
 		clisockdata->s.socket = clisock;
 		clisockdata->s.is_blocked = true;
 		php_netstream_set_nonblocking(&clisockdata->s);
+		/* accepted by us, non-blocking already when the ring accepted it */
+		clisockdata->s.restore_blocking = true;
 
 		xparam->outputs.client = php_stream_alloc_rel(stream->ops, clisockdata, NULL, "r+");
 		if (xparam->outputs.client) {

ext/sockets/sockets.c

@@ -770,6 +770,7 @@ static int php_socket_connect(php_socket *sock, const struct sockaddr *addr, soc
 		php_deadline dl = php_socket_op_deadline(sock, SO_SNDTIMEO, 0);
 		int ret = php_io_connect_ex(o.stream, o.handle, sock->bsd_socket, addr, addrlen, &dl);
 		php_socket_op_end(sock, &o);
+		php_socket_op_errno(ret);
 		if (ret != 0 && errno == PHP_SOCKET_WAIT_TIMEOUT) {
 			set_errno(EINPROGRESS);
 		}

ext/standard/tests/streams/hooks/scheduler.inc

@@ -33,7 +33,7 @@ class Scheduler implements \Io\Hooks\Hooks
         return new \Io\Poll\OperationQueue();
     }
 
-    /* IO_HOOKS_CAPS=files,direct opts in to what the queue supports, default is its own set */
+    /* IO_HOOKS_CAPS=files,directData,directAccept opts in to what the queue supports, default is its own set */
     public static function capabilities(\Io\OperationQueue $queue, ?array $wanted = null): array
     {
         if ($wanted === null) {

main/io/php_io_queue_poll.c

@@ -528,8 +528,9 @@ static zend_result php_io_poll_queue_cancel(php_io_queue *base, php_io_op *op)
 }
 
 /* A registration retains the descriptor's record between waits, and an Edge pair arms it
- * edge-triggered for good. The record is found by descriptor, never through the registration,
- * so a record a replaced provider left behind costs nothing more than its memory. */
+ * edge-triggered for good. The record is found through the registration while the queue's id
+ * matches and by descriptor otherwise, so a record a replaced provider left behind costs nothing
+ * more than its memory. */
 static zend_result php_io_poll_queue_add(php_io_queue *base, php_io_registration *registration)
 {
 	php_io_poll_queue *q = (php_io_poll_queue *) base;