Author: ps-guest Date: 2010-02-01 08:50:40 +0000 (Mon, 01 Feb 2010) New Revision: 4126
Modified: glibc-package/branches/eglibc-2.11/debian/patches/any/local-no-SOCK_NONBLOCK.diff Log: add missing part of local-no-SOCK_NONBLOCK.diff, somehow lost during merge from trunk ... Modified: glibc-package/branches/eglibc-2.11/debian/patches/any/local-no-SOCK_NONBLOCK.diff =================================================================== --- glibc-package/branches/eglibc-2.11/debian/patches/any/local-no-SOCK_NONBLOCK.diff 2010-02-01 04:20:16 UTC (rev 4125) +++ glibc-package/branches/eglibc-2.11/debian/patches/any/local-no-SOCK_NONBLOCK.diff 2010-02-01 08:50:40 UTC (rev 4126) @@ -1,14 +1,28 @@ --- a/resolv/res_send.c +++ b/resolv/res_send.c -@@ -933,6 +933,7 @@ - if (EXT(statp).nssocks[ns] == -1) { +@@ -104,11 +104,13 @@ + #endif + + ++#ifdef SOCK_NONBLOCK + #ifndef __ASSUME_SOCK_CLOEXEC + static int __have_o_nonblock; + #else + # define __have_o_nonblock 0 + #endif ++#endif + + + /* From ev_streams.c. */ +@@ -915,6 +917,7 @@ + /* only try IPv6 if IPv6 NS and if not failed before */ if ((EXT(statp).nscount6 > 0) && !statp->ipv6_unavail) { +#ifdef SOCK_NONBLOCK if (__builtin_expect (__have_o_nonblock >= 0, 1)) { EXT(statp).nssocks[ns] = socket(PF_INET6, SOCK_DGRAM|SOCK_NONBLOCK, -@@ -945,6 +946,7 @@ +@@ -927,6 +930,7 @@ #endif } if (__builtin_expect (__have_o_nonblock < 0, 0)) @@ -16,7 +30,7 @@ EXT(statp).nssocks[ns] = socket(PF_INET6, SOCK_DGRAM, 0); if (EXT(statp).nssocks[ns] < 0) -@@ -955,6 +957,7 @@ +@@ -937,6 +941,7 @@ convaddr4to6(nsap); } if (EXT(statp).nssocks[ns] < 0) { @@ -24,7 +38,7 @@ if (__builtin_expect (__have_o_nonblock >= 0, 1)) { EXT(statp).nssocks[ns] = socket(PF_INET, SOCK_DGRAM|SOCK_NONBLOCK, -@@ -967,6 +970,7 @@ +@@ -949,6 +954,7 @@ #endif } if (__builtin_expect (__have_o_nonblock < 0, 0)) @@ -32,7 +46,7 @@ EXT(statp).nssocks[ns] = socket(PF_INET, SOCK_DGRAM, 0); } -@@ -994,7 +998,11 @@ +@@ -976,7 +982,11 @@ __res_iclose(statp, false); return (0); } @@ -40,13 +54,13 @@ if (__builtin_expect (__have_o_nonblock < 0, 0)) { +#else + { -+#endif ++#endif /* Make socket non-blocking. */ int fl = __fcntl (EXT(statp).nssocks[ns], F_GETFL); if (fl != -1) --- a/nscd/connections.c +++ b/nscd/connections.c -@@ -1837,6 +1837,7 @@ +@@ -1835,6 +1835,7 @@ /* We have a new incoming connection. Accept the connection. */ int fd; @@ -54,7 +68,7 @@ #ifndef __ASSUME_ACCEPT4 fd = -1; if (have_accept4 >= 0) -@@ -1853,6 +1854,9 @@ +@@ -1851,6 +1852,9 @@ if (have_accept4 < 0) fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL)); #endif @@ -64,7 +78,7 @@ /* Use the descriptor if we have not reached the limit. */ if (fd >= 0) -@@ -2042,7 +2046,7 @@ +@@ -2040,7 +2044,7 @@ { /* A new connection. */ int fd; @@ -73,13 +87,13 @@ # ifndef __ASSUME_ACCEPT4 fd = -1; if (have_accept4 >= 0) -@@ -2059,6 +2063,9 @@ +@@ -2057,6 +2061,9 @@ if (have_accept4 < 0) fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL)); # endif +#else + fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL)); -+#endif ++#endif /* Use the descriptor if we have not reached the limit. */ if (fd >= 0) -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org