Index: src/interfaces/libpq/fe-connect.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v
retrieving revision 1.181
diff -u -r1.181 fe-connect.c
--- src/interfaces/libpq/fe-connect.c	2001/11/11 02:09:05	1.181
+++ src/interfaces/libpq/fe-connect.c	2002/03/16 05:17:47
@@ -909,29 +909,48 @@
 	 * Thus, we have to make arrangements for all eventualities.
 	 * ----------
 	 */
-	if (connect(conn->sock, &conn->raddr.sa, conn->raddr_len) < 0)
-	{
-		if (SOCK_ERRNO == EINPROGRESS || SOCK_ERRNO == EWOULDBLOCK || SOCK_ERRNO == 0)
-		{
-			/*
-			 * This is fine - we're in non-blocking mode, and the
-			 * connection is in progress.
-			 */
-			conn->status = CONNECTION_STARTED;
-		}
-		else
-		{
-			/* Something's gone wrong */
-			connectFailureMessage(conn, SOCK_ERRNO);
-			goto connect_errReturn;
+	do {
+		int e;
+		e=connect(conn->sock, &conn->raddr.sa, conn->raddr_len)
+
+		if(e < 0) {
+			switch (e) {
+				case EINTR:
+					/*
+					 * Interrupted by a signal, keep trying.  This handling is
+					 * required because the user may have turned on signals in
+					 * his program.  Previously, libpq would erronously fail to
+					 * connect if the user's timer event fired and interrupted
+					 * this syscall.  It is important that we don't try to sleep
+					 * here because this may cause havoc with the user program.
+					 */
+					continue;
+					break;
+				case 0:
+				case EINPROGRESS:
+				case EWOULDBLOCK:
+					/*
+					 * This is fine - we're in non-blocking mode, and the
+					 * connection is in progress.
+					 */
+					conn->status = CONNECTION_STARTED;
+					break;
+				default:
+					/* Something's gone wrong */
+					connectFailureMessage(conn, SOCK_ERRNO);
+					goto connect_errReturn;
+					break;
+			}
+		} else {
+			/* We're connected now */
+			conn->status = CONNECTION_MADE;
 		}
-	}
-	else
-	{
-		/* We're connected already */
-		conn->status = CONNECTION_MADE;
-	}
+		
+		if(conn->status == CONNECTION_STARTED || conn->status == CONNECTION_MADE)
+			break;
 
+	} while(1);
+	
 #ifdef USE_SSL
 	/* Attempt to negotiate SSL usage */
 	if (conn->allow_ssl_try)