Add tv_sec change for connection timeout suggested by author.

bmomjian · bmomjian · commit 3258484d032c · 2002-10-11T04:41:59.000Z
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.207 2002/10/11 04:12:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.208 2002/10/11 04:41:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1078,7 +1078,8 @@ connectDBComplete(PGconn *conn)
 		finish_time = time((time_t *) NULL) + remains.tv_sec;
 	}
 
-	while (rp == NULL || remains.tv_sec > 0 || remains.tv_usec > 0)
+	while (rp == NULL || remains.tv_sec > 0 ||
+		   (remains.tv_sec == 0 && remains.tv_usec > 0))
 	{
 		/*
 		 * Wait, if necessary.	Note that the initial state (just after
@@ -1131,10 +1132,7 @@ connectDBComplete(PGconn *conn)
 				return 0;
 			}
 
-			if (finish_time > current_time)
-				remains.tv_sec = finish_time - current_time;
-			else
-				remains.tv_sec = 0;
+			remains.tv_sec = finish_time - current_time;
 			remains.tv_usec = 0;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.207 2002/10/11 04:12:14 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.208 2002/10/11 04:41:59 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1078,7 +1078,8 @@ connectDBComplete(PGconn *conn)`
`1078`	`1078`	`finish_time = time((time_t *) NULL) + remains.tv_sec;`
`1079`	`1079`	`}`
`1080`	`1080`
`1081`		`- while (rp == NULL \|\| remains.tv_sec > 0 \|\| remains.tv_usec > 0)`
	`1081`	`+ while (rp == NULL \|\| remains.tv_sec > 0 \|\|`
	`1082`	`+ (remains.tv_sec == 0 && remains.tv_usec > 0))`
`1082`	`1083`	`{`
`1083`	`1084`	`/*`
`1084`	`1085`	`* Wait, if necessary. Note that the initial state (just after`
`@@ -1131,10 +1132,7 @@ connectDBComplete(PGconn *conn)`
`1131`	`1132`	`return 0;`
`1132`	`1133`	`}`
`1133`	`1134`
`1134`		`- if (finish_time > current_time)`
`1135`		`- remains.tv_sec = finish_time - current_time;`
`1136`		`- else`
`1137`		`- remains.tv_sec = 0;`
	`1135`	`+ remains.tv_sec = finish_time - current_time;`
`1138`	`1136`	`remains.tv_usec = 0;`
`1139`	`1137`	`}`
`1140`	`1138`	`}`