From: Anirudh Ramachandran <avr@fb.com>
Date: Fri, 20 Nov 2015 16:35:40 +0000 (-0800)
Subject: Remove unnecessary resetClientHelloParsing callback in AsyncSSLSocket
X-Git-Tag: deprecate-dynamic-initializer~245
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=422bf87407a54d44da2f96826b74d3d66e49b222;p=folly.git

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
---

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) {