From: Wilfried Göesgens <willi@citadel.org>
Date: Sat, 3 Oct 2009 19:17:10 +0000 (+0000)
Subject: * if is_https don't set nonblocking.
X-Git-Tag: v7.86~808
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=06c5848b09b48a8574380490eb259d4b88600cf8

* if is_https don't set nonblocking.
---

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 3e3194b34..841021ee2 100644
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -120,15 +120,16 @@ int tcp_connectsock(char *host, char *service)
 	}
 	alarm(0);
 	signal(SIGALRM, SIG_IGN);
-
-	fdflags = fcntl(s, F_GETFL);
-	if (fdflags < 0)
-		lprintf(1, "unable to get socket flags!  %s.%s: %s \n",
-			host, service, strerror(errno));
-	fdflags = fdflags | O_NONBLOCK;
-	if (fcntl(s, F_SETFD, fdflags) < 0)
-		lprintf(1, "unable to set socket nonblocking flags!  %s.%s: %s \n",
-			host, service, strerror(errno));
+	if (!is_https) {
+		fdflags = fcntl(s, F_GETFL);
+		if (fdflags < 0)
+			lprintf(1, "unable to get socket flags!  %s.%s: %s \n",
+				host, service, strerror(errno));
+		fdflags = fdflags | O_NONBLOCK;
+		if (fcntl(s, F_SETFD, fdflags) < 0)
+			lprintf(1, "unable to set socket nonblocking flags!  %s.%s: %s \n",
+				host, service, strerror(errno));
+	}
 	return (s);
 }