fix-pq_getbyte_if_available-1.patch

? aaa.patch
? postgres
? access/common/.deps
? access/gin/.deps
? access/gist/.deps
? access/hash/.deps
? access/heap/.deps
? access/index/.deps
? access/nbtree/.deps
? access/transam/.deps
? bootstrap/.deps
? catalog/.deps
? commands/.deps
? executor/.deps
? foreign/.deps
? foreign/dummy/.deps
? foreign/postgresql/.deps
? lib/.deps
? libpq/.deps
? main/.deps
? nodes/.deps
? optimizer/geqo/.deps
? optimizer/path/.deps
? optimizer/plan/.deps
? optimizer/prep/.deps
? optimizer/util/.deps
? parser/.deps
? po/af.mo
? po/cs.mo
? po/hr.mo
? po/hu.mo
? po/it.mo
? po/ko.mo
? po/nb.mo
? po/nl.mo
? po/pl.mo
? po/ro.mo
? po/ru.mo
? po/sk.mo
? po/sl.mo
? po/sv.mo
? po/zh_CN.mo
? po/zh_TW.mo
? port/.deps
? postmaster/.deps
? regex/.deps
? replication/.deps
? replication/libpqwalreceiver/.deps
? rewrite/.deps
? snowball/.deps
? snowball/snowball_create.sql
? storage/buffer/.deps
? storage/file/.deps
? storage/freespace/.deps
? storage/ipc/.deps
? storage/large_object/.deps
? storage/lmgr/.deps
? storage/page/.deps
? storage/smgr/.deps
? tcop/.deps
? tsearch/.deps
? utils/.deps
? utils/probes.h
? utils/adt/.deps
? utils/cache/.deps
? utils/error/.deps
? utils/fmgr/.deps
? utils/hash/.deps
? utils/init/.deps
? utils/mb/.deps
? utils/mb/Unicode/BIG5.TXT
? utils/mb/Unicode/CP950.TXT
? utils/mb/conversion_procs/conversion_create.sql
? utils/mb/conversion_procs/ascii_and_mic/.deps
? utils/mb/conversion_procs/cyrillic_and_mic/.deps
? utils/mb/conversion_procs/euc2004_sjis2004/.deps
? utils/mb/conversion_procs/euc_cn_and_mic/.deps
? utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/.deps
? utils/mb/conversion_procs/euc_jp_and_sjis/.deps
? utils/mb/conversion_procs/euc_kr_and_mic/.deps
? utils/mb/conversion_procs/euc_tw_and_big5/.deps
? utils/mb/conversion_procs/latin2_and_win1250/.deps
? utils/mb/conversion_procs/latin_and_mic/.deps
? utils/mb/conversion_procs/utf8_and_ascii/.deps
? utils/mb/conversion_procs/utf8_and_big5/.deps
? utils/mb/conversion_procs/utf8_and_cyrillic/.deps
? utils/mb/conversion_procs/utf8_and_euc2004/.deps
? utils/mb/conversion_procs/utf8_and_euc_cn/.deps
? utils/mb/conversion_procs/utf8_and_euc_jis_2004/.deps
? utils/mb/conversion_procs/utf8_and_euc_jp/.deps
? utils/mb/conversion_procs/utf8_and_euc_kr/.deps
? utils/mb/conversion_procs/utf8_and_euc_tw/.deps
? utils/mb/conversion_procs/utf8_and_gb18030/.deps
? utils/mb/conversion_procs/utf8_and_gbk/.deps
? utils/mb/conversion_procs/utf8_and_iso8859/.deps
? utils/mb/conversion_procs/utf8_and_iso8859_1/.deps
? utils/mb/conversion_procs/utf8_and_johab/.deps
? utils/mb/conversion_procs/utf8_and_shift_jis_2004/.deps
? utils/mb/conversion_procs/utf8_and_sjis/.deps
? utils/mb/conversion_procs/utf8_and_sjis2004/.deps
? utils/mb/conversion_procs/utf8_and_uhc/.deps
? utils/mb/conversion_procs/utf8_and_win/.deps
? utils/misc/.deps
? utils/mmgr/.deps
? utils/resowner/.deps
? utils/sort/.deps
? utils/time/.deps
Index: libpq/be-secure.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v
retrieving revision 1.96
diff -c -r1.96 be-secure.c
*** libpq/be-secure.c	15 Jan 2010 09:19:02 -0000	1.96
--- libpq/be-secure.c	18 Feb 2010 09:42:30 -0000
***************
*** 256,262 ****
  			case SSL_ERROR_WANT_READ:
  			case SSL_ERROR_WANT_WRITE:
  				if (port->noblock)
! 					return 0;
  #ifdef WIN32
  				pgwin32_waitforsinglesocket(SSL_get_fd(port->ssl),
  											(err == SSL_ERROR_WANT_READ) ?
--- 256,266 ----
  			case SSL_ERROR_WANT_READ:
  			case SSL_ERROR_WANT_WRITE:
  				if (port->noblock)
! 				{
! 					errno = EWOULDBLOCK;
! 					n = -1;
! 					break;
! 				}
  #ifdef WIN32
  				pgwin32_waitforsinglesocket(SSL_get_fd(port->ssl),
  											(err == SSL_ERROR_WANT_READ) ?
Index: libpq/pqcomm.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v
retrieving revision 1.203
diff -c -r1.203 pqcomm.c
*** libpq/pqcomm.c	16 Feb 2010 19:26:02 -0000	1.203
--- libpq/pqcomm.c	18 Feb 2010 09:42:30 -0000
***************
*** 822,828 ****
   *			if available
   *
   * The received byte is stored in *c. Returns 1 if a byte was read, 0 if
!  * if no data was available, or EOF.
   * --------------------------------
   */
  int
--- 822,828 ----
   *			if available
   *
   * The received byte is stored in *c. Returns 1 if a byte was read, 0 if
!  * if no data was available, or EOF if trouble.
   * --------------------------------
   */
  int
***************
*** 848,853 ****
--- 848,879 ----
  	PG_TRY();
  	{
  		r = secure_read(MyProcPort, c, 1);
+ 		if (r < 0)
+ 		{
+ 			/*
+ 			 * Ok if would block or interrupted (though it really shouldn't
+ 			 * happen with a non-blocking operation).
+ 			 */
+ 			if (errno == EAGAIN || EWOULDBLOCK || errno == EINTR)
+ 				r = 0;
+ 			else
+ 			{
+ 				/*
+ 				 * Careful: an ereport() that tries to write to the client would
+ 				 * cause recursion to here, leading to stack overflow and core
+ 				 * dump!  This message must go *only* to the postmaster log.
+ 				 */
+ 				ereport(COMMERROR,
+ 						(errcode_for_socket_access(),
+ 						 errmsg("could not receive data from client: %m")));
+ 				return EOF;
+ 			}
+ 		}
+ 		else if (r == 0)
+ 		{
+ 			/* EOF detected */
+ 			r = EOF;
+ 		}
  	}
  	PG_CATCH();
  	{
Index: replication/walsender.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/replication/walsender.c,v
retrieving revision 1.6
diff -c -r1.6 walsender.c
*** replication/walsender.c	17 Feb 2010 04:19:39 -0000	1.6
--- replication/walsender.c	18 Feb 2010 09:42:30 -0000
***************
*** 286,300 ****
  				break;
  			}
  
! 			/* 'X' means that the standby is closing the connection */
  			case 'X':
  				proc_exit(0);
  
- 			case EOF:
- 				ereport(ERROR,
- 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
- 						 errmsg("unexpected EOF on standby connection")));
- 
  			default:
  				ereport(FATAL,
  						(errcode(ERRCODE_PROTOCOL_VIOLATION),
--- 286,304 ----
  				break;
  			}
  
! 			/*
! 			 * 'X' means that the standby is closing the connection. EOF
! 			 * means unexpected loss of standby connection. Either way,
! 			 * perform normal shutdown.
! 			 */
! 			case EOF:
!  				ereport(COMMERROR,
!  						(errcode(ERRCODE_PROTOCOL_VIOLATION),
!  						 errmsg("unexpected EOF on standby connection")));
! 				/* fall through */
  			case 'X':
  				proc_exit(0);
  
  			default:
  				ereport(FATAL,
  						(errcode(ERRCODE_PROTOCOL_VIOLATION),
***************
*** 315,350 ****
  	r = pq_getbyte_if_available(&firstchar);
  	if (r < 0)
  	{
! 		/* no data available */
! 		if (errno == EAGAIN || errno == EWOULDBLOCK)
! 			return;
! 
! 		/*
! 		 * Ok if interrupted, though it shouldn't really happen with
! 		 * a non-blocking operation.
! 		 */
! 		if (errno == EINTR)
! 			return;
! 
  		ereport(COMMERROR,
! 				(errcode_for_socket_access(),
! 				 errmsg("could not receive data from client: %m")));
  	}
  	if (r == 0)
  	{
! 		/* standby disconnected unexpectedly */
! 		ereport(ERROR,
! 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
! 				 errmsg("unexpected EOF on standby connection")));
  	}
  
  	/* Handle the very limited subset of commands expected in this phase */
  	switch (firstchar)
  	{
  		/*
! 		 * 'X' means that the standby is closing down the socket. EOF means
! 		 * unexpected loss of standby connection. Either way, perform normal
! 		 * shutdown.
  		 */
  		case 'X':
  			proc_exit(0);
--- 319,341 ----
  	r = pq_getbyte_if_available(&firstchar);
  	if (r < 0)
  	{
! 		/* unexpected error */
  		ereport(COMMERROR,
! 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
! 				 errmsg("unexpected EOF on standby connection")));
! 		proc_exit(0);
  	}
  	if (r == 0)
  	{
! 		/* no data available without blocking */
! 		return;
  	}
  
  	/* Handle the very limited subset of commands expected in this phase */
  	switch (firstchar)
  	{
  		/*
! 		 * 'X' means that the standby is closing down the socket.
  		 */
  		case 'X':
  			proc_exit(0);