Fix stupid omission in c4901a1.

anarazel · anarazel · commit 6eb2be15b5d2 · 2016-03-18T22:37:59.000-07:00
Reported-By: Jeff Janes
Discussion: CAMkU=1zGxREwoyaCrp_CHadEB+dPgpVyKBysCJ+6xP9gCOvAuw@mail.gmail.com
diff --git a/src/backend/port/unix_latch.c b/src/backend/port/unix_latch.c
@@ -389,7 +389,7 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock,
 				/* socket is writable */
 				result |= WL_SOCKET_WRITEABLE;
 			}
-			if ((wakeEvents & WL_SOCKET_WRITEABLE) &&
+			if ((wakeEvents & (WL_SOCKET_READABLE | WL_SOCKET_WRITEABLE)) &&
 				(pfds[1].revents & (POLLHUP | POLLERR | POLLNVAL)))
 			{
 				/* EOF/error condition */

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock,`
`389`	`389`	`/* socket is writable */`
`390`	`390`	`result \|= WL_SOCKET_WRITEABLE;`
`391`	`391`	`}`
`392`		`- if ((wakeEvents & WL_SOCKET_WRITEABLE) &&`
	`392`	`+ if ((wakeEvents & (WL_SOCKET_READABLE \| WL_SOCKET_WRITEABLE)) &&`
`393`	`393`	`(pfds[1].revents & (POLLHUP \| POLLERR \| POLLNVAL)))`
`394`	`394`	`{`
`395`	`395`	`/* EOF/error condition */`