[openssl] master update

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


The branch master has been updated
       via  0b885f72c2b18c57173e134a03ed013cd1ac361e (commit)
      from  a3c62426b9c056af802ab7988f217e55eaf2b213 (commit)


- Log -----------------------------------------------------------------
commit 0b885f72c2b18c57173e134a03ed013cd1ac361e
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)

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

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 e482e2d..781efd2 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -776,6 +776,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