From 422bf87407a54d44da2f96826b74d3d66e49b222 Mon Sep 17 00:00:00 2001 From: Anirudh Ramachandran Date: Fri, 20 Nov 2015 08:35:40 -0800 Subject: [PATCH] Remove unnecessary resetClientHelloParsing callback in AsyncSSLSocket Summary: Remove unnecessary resetClientHelloParsing callback which causes problems wiht Openssl 1.0.2 Reviewed By: knekritz Differential Revision: D2664730 fb-gh-sync-id: d1b55ae493b4c92627ad41e7bf85f1e1a777bd2b --- folly/io/async/AsyncSSLSocket.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/folly/io/async/AsyncSSLSocket.cpp b/folly/io/async/AsyncSSLSocket.cpp index d2520bef..8874235d 100644 --- a/folly/io/async/AsyncSSLSocket.cpp +++ b/folly/io/async/AsyncSSLSocket.cpp @@ -977,8 +977,8 @@ AsyncSSLSocket::handleAccept() noexcept { } if (server_ && parseClientHello_) { - SSL_set_msg_callback_arg(ssl_, this); SSL_set_msg_callback(ssl_, &AsyncSSLSocket::clientHelloParsingCallback); + SSL_set_msg_callback_arg(ssl_, this); } errno = 0; @@ -1575,7 +1575,6 @@ AsyncSSLSocket::clientHelloParsingCallback(int written, int version, return; } if (contentType != SSL3_RT_HANDSHAKE) { - sock->resetClientHelloParsing(ssl); return; } if (len == 0) { -- 2.34.1