Zebediah Figura : server: Inherit the SO_SNDTIMEO value in accept_socket().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 418dff0c0122655aa6bf505333860b9e785c732a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/418dff0c0122655aa6bf505333860b9...

Author: Zebediah Figura 
Date:   Mon Dec 12 17:09:48 2022 -0600

server: Inherit the SO_SNDTIMEO value in accept_socket().

---

dlls/ws2_32/tests/sock.c | 2 +-
 server/sock.c            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index f32776de17f..cb99ceb4b24 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -4828,7 +4828,7 @@ static void test_accept_inheritance(void)
         len = sizeof(value);
         ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len);
         ok(!ret, "test %u: got error %u\n", i, WSAGetLastError());
-        todo_wine_if (i >= 5 && i <= 6)
+        todo_wine_if (i == 6)
             ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value);
     }

diff --git a/server/sock.c b/server/sock.c
index 4a16180a960..a64ea8f7e56 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -2001,6 +2001,7 @@ static struct sock *accept_socket( struct sock *sock )
         acceptsock->exclusiveaddruse    = sock->exclusiveaddruse;
         acceptsock->sndbuf              = sock->sndbuf;
         acceptsock->rcvbuf              = sock->rcvbuf;
+        acceptsock->sndtimeo            = sock->sndtimeo;
         acceptsock->connect_time        = current_time;

if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );