From: Zebediah Figura zfigura@codeweavers.com
--- dlls/ws2_32/tests/sock.c | 3 +-- server/sock.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cb99ceb4b24..6f2bcb73a06 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,8 +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 == 6) - ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); + ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); }
len = sizeof(linger); diff --git a/server/sock.c b/server/sock.c index a64ea8f7e56..a64cb22404e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2002,6 +2002,7 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->sndbuf = sock->sndbuf; acceptsock->rcvbuf = sock->rcvbuf; acceptsock->sndtimeo = sock->sndtimeo; + acceptsock->rcvtimeo = sock->rcvtimeo; acceptsock->connect_time = current_time;
if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );