postgres.git / summary / log / commit / refs

commit    74242c23c1c6428c6da09fa37264c7f4f1438738
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Thu Dec 05 17:48:28 2013 +0000
First released in: 9.4.0, 8.4.20, 9.0.16, 9.1.12, 9.2.7, 9.3.3

    Clear retry flags properly in replacement OpenSSL sock_write function.
    
    Current OpenSSL code includes a BIO_clear_retry_flags() step in the
    sock_write() function.  Either we failed to copy the code correctly, or
    they added this since we copied it.  In any case, lack of the clear step
    appears to be the cause of the server lockup after connection loss reported
    in bug #8647 from Valentine Gogichashvili.  Assume that this is correct
    coding for all OpenSSL versions, and hence back-patch to all supported
    branches.
    
    Diagnosis and patch by Alexander Kukushkin.


 src/backend/libpq/be-secure.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index fb468fec43f..573ad3e731d 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -464,7 +464,10 @@ wloop:
  * non-reentrant libc facilities. We also need to call send() and recv()
  * directly so it gets passed through the socket/signals layer on Win32.
  *
- * They are closely modelled on the original socket implementations in OpenSSL.
+ * These functions are closely modelled on the standard socket BIO in OpenSSL;
+ * see sock_read() and sock_write() in OpenSSL's crypto/bio/bss_sock.c.
+ * XXX OpenSSL 1.0.1e considers many more errcodes than just EINTR as reasons
+ * to retry; do we need to adopt their logic for that?
  */
 
 static bool my_bio_initialized = false;
@@ -502,6 +505,7 @@ my_sock_write(BIO *h, const char *buf, int size)
 	int			res = 0;
 
 	res = send(h->num, buf, size, 0);
+	BIO_clear_retry_flags(h);
 	if (res <= 0)
 	{
 		if (errno == EINTR)


[parent: 07aeb1fec571]