X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fs3_clnt.c;h=3a27f9386855243b9a3b53a13b567ce59e232313;hp=f46aaef6ce026a56dbc48b093ae05ebf49285fa0;hb=4817504d069b4c5082161b02a22116ad75f822b1;hpb=84b6e277d4f45487377d0159e82c356d750e1218

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index f46aaef6ce..3a27f93868 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -204,6 +204,18 @@ int ssl3_connect(SSL *s)
 	s->in_handshake++;
 	if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
 
+#ifndef OPENSSL_NO_HEARTBEATS
+	/* If we're awaiting a HeartbeatResponse, pretend we
+	 * already got and don't await it anymore, because
+	 * Heartbeats don't make sense during handshakes anyway.
+	 */
+	if (s->tlsext_hb_pending)
+		{
+		s->tlsext_hb_pending = 0;
+		s->tlsext_hb_seq++;
+		}
+#endif
+
 	for (;;)
 		{
 		state=s->state;