[master] ab70df5 Fix typo

Tollef Fog Heen tfheen at varnish-cache.org
Tue Mar 8 10:53:04 CET 2011


commit ab70df53d69d3f89653321f66218e6c8283e7212
Author: Tollef Fog Heen <tfheen at varnish-software.com>
Date:   Tue Mar 8 10:51:29 2011 +0100

    Fix typo
    
    I forgot to rename the tv_get variable to tv in configure.ac
    
    Fixes #853
    
    (again)

diff --git a/configure.ac b/configure.ac
index 19b194c..2ac0c94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,8 +353,8 @@ int sd = socket(AF_INET, SOCK_STREAM, 0);
 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_get, &l) == 0) {
-        return (l == sizeof tv);
+    if (getsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, &tv, &l) == 0) {
+        return 0;
     }
 }
 return 1;
@@ -378,8 +378,8 @@ int sd = socket(AF_INET, SOCK_STREAM, 0);
 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_get, &l) == 0) {
-        return (l == sizeof tv);
+    if (getsockopt(sd, SOL_SOCKET, SO_SNDTIMEO, &tv, &l) == 0) {
+        return 0;
     }
 }
 return 1;



More information about the varnish-commit mailing list