Commit8e9c52e

committed

EINTR return from connect() should be treated exactly the same as

EINPROGRESS, according to Florian Hars. I'm not completely convincedbut the spec does seem to read that way.

1 parentd90c531 commit8e9c52eCopy full SHA for 8e9c52e

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.316 2005/08/09 05:14:26 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.317 2005/08/11 22:53:41 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1082,15 +1082,12 @@ PQconnectPoll(PGconn *conn)`
`1082`	`1082`	`* since we are in nonblock mode. If it does, well,`
`1083`	`1083`	`* too bad.`
`1084`	`1084`	`*/`
`1085`		`-retry_connect:`
`1086`	`1085`	`if (connect(conn->sock,addr_cur->ai_addr,`
`1087`	`1086`	`addr_cur->ai_addrlen)<0)`
`1088`	`1087`	`{`
`1089`		`-if (SOCK_ERRNO==EINTR)`
`1090`		`-/* Interrupted system call - just try again */`
`1091`		`-gotoretry_connect;`
`1092`	`1088`	`if (SOCK_ERRNO==EINPROGRESS\|\|`
`1093`	`1089`	`SOCK_ERRNO==EWOULDBLOCK\|\|`
	`1090`	`+SOCK_ERRNO==EINTR\|\|`
`1094`	`1091`	`SOCK_ERRNO==0)`
`1095`	`1092`	`{`
`1096`	`1093`	`/*`

Comments

(0)