[master] cd458db Tighten SO{RCV,SND}TIMEO check
Tollef Fog Heen
tfheen at varnish-cache.org
Tue Mar 8 11:04:30 CET 2011
commit cd458db6d792022164b5221f6313ae4079982b58
Author: Tollef Fog Heen <tfheen at varnish-software.com>
Date: Tue Mar 8 11:03:50 2011 +0100
Tighten SO{RCV,SND}TIMEO check
We can check the size of the return value too.
diff --git a/configure.ac b/configure.ac
index 2ac0c94..ab2bd65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -354,7 +354,7 @@ struct timeval tv = { 1, 0 };
if (setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof tv) == 0) {
socklen_t l = sizeof tv;
if (getsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, &tv, &l) == 0) {
- return 0;
+ return (l != sizeof tv);
}
}
return 1;
@@ -379,7 +379,7 @@ struct timeval tv = { 1, 0 };
if (setsockopt(sd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof tv) == 0) {
socklen_t l = sizeof tv;
if (getsockopt(sd, SOL_SOCKET, SO_SNDTIMEO, &tv, &l) == 0) {
- return 0;
+ return (l != sizeof tv);
}
}
return 1;
More information about the varnish-commit
mailing list