Commit 03391aab authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

server: Inherit the SO_RCVTIMEO value in accept_socket().

parent 418dff0c
...@@ -4828,8 +4828,7 @@ static void test_accept_inheritance(void) ...@@ -4828,8 +4828,7 @@ static void test_accept_inheritance(void)
len = sizeof(value); len = sizeof(value);
ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len);
ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); 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); len = sizeof(linger);
......
...@@ -2002,6 +2002,7 @@ static struct sock *accept_socket( struct sock *sock ) ...@@ -2002,6 +2002,7 @@ static struct sock *accept_socket( struct sock *sock )
acceptsock->sndbuf = sock->sndbuf; acceptsock->sndbuf = sock->sndbuf;
acceptsock->rcvbuf = sock->rcvbuf; acceptsock->rcvbuf = sock->rcvbuf;
acceptsock->sndtimeo = sock->sndtimeo; acceptsock->sndtimeo = sock->sndtimeo;
acceptsock->rcvtimeo = sock->rcvtimeo;
acceptsock->connect_time = current_time; acceptsock->connect_time = current_time;
if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event ); if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment