From: Yang Tse <yangsita@gmail.com>
Date: Sat, 5 Jan 2008 01:39:07 +0000 (+0000)
Subject: Don't abort operation when attempting to set SO_KEEPALIVE
X-Git-Tag: curl-7_18_0~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29121898758db80720ff6229cececef5d038c06e;p=thirdparty%2Fcurl.git

Don't abort operation when attempting to set SO_KEEPALIVE
fails, just issue a warning and ignore the failure.
---

diff --git a/src/main.c b/src/main.c
index 78f37c79a0..1f3ff706bb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1447,8 +1447,10 @@ static int set_so_keepalive(void *clientp, curl_socket_t curlfd,
   case CURLSOCKTYPE_IPCXN:
     if(setsockopt(curlfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&onoff,
                   sizeof(onoff)) < 0) {
+      /* don't abort operation, just issue a warning */
+      SET_SOCKERRNO(0);
       warnf(clientp, "Could not set SO_KEEPALIVE!\n");
-      return 1;
+      return 0;
     }
     break;
   default: