[openssl] OpenSSL_1_1_1-stable update

Matt Caswell matt at openssl.org
Thu Mar 28 10:33:28 UTC 2019


The branch OpenSSL_1_1_1-stable has been updated
       via  c7ea47b1f940c90f539c5550e1a89d0d860ddd85 (commit)
      from  0db8f86a18925bd239600a4e3cd5dc31de31258f (commit)


- Log -----------------------------------------------------------------
commit c7ea47b1f940c90f539c5550e1a89d0d860ddd85
Author: Paul Monson <paulmon at microsoft.com>
Date:   Tue Mar 26 15:25:19 2019 -0700

    conn_is_closed should return 1 if get_last_sys_error is WSAECONNRESET
    CLA: trivial
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8590)
    
    (cherry picked from commit 0b885f72c2b18c57173e134a03ed013cd1ac361e)

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem_srvr.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 6b8aae6..d454326 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -775,6 +775,10 @@ static ossl_inline int conn_is_closed(void)
     case ECONNRESET:
         return 1;
 #endif
+#if defined(WSAECONNRESET)
+    case WSAECONNRESET:
+        return 1;
+#endif
     default:
         return 0;
     }


More information about the openssl-commits mailing list