From 67c44799c811182c7c5d558cf764d05ae3c097eb Mon Sep 17 00:00:00 2001 From: Sergey Lyubka Date: Wed, 5 Mar 2014 01:57:09 +0000 Subject: [PATCH] SSL_accept() error handling fix --- mongoose.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mongoose.c b/mongoose.c index d9502ca7..0e7b4d37 100644 --- a/mongoose.c +++ b/mongoose.c @@ -659,7 +659,7 @@ static void ns_read_from_socket(struct ns_connection *conn) { DBG(("%p res %d %d", conn, res, ssl_err)); if (res == 1) { conn->flags = NSF_SSL_HANDSHAKE_DONE; - } else if (res == 0 || ssl_err == 2 || ssl_err == 3) { + } else if (res == 0 && (ssl_err == 2 || ssl_err == 3)) { return; // Call us again } else { ok = 1; @@ -685,7 +685,7 @@ static void ns_read_from_socket(struct ns_connection *conn) { DBG(("%p res %d %d", conn, res, ssl_err)); if (res == 1) { conn->flags |= NSF_SSL_HANDSHAKE_DONE; - } else if (res == 0 || ssl_err == 2 || ssl_err == 3) { + } else if (res == 0 && (ssl_err == 2 || ssl_err == 3)) { return; // Call us again } else { conn->flags |= NSF_CLOSE_IMMEDIATELY;