From 7f668454d49fa20a1888474bc9fd7a91ca665e34 Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Sat, 19 Apr 2014 19:40:11 +0000
Subject: release buffers fix was lost in merge. put it back.

---
 src/lib/libssl/s3_pkt.c         | 3 ++-
 src/lib/libssl/src/ssl/s3_pkt.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c
index 52c48e945e..60c51146ac 100644
--- a/src/lib/libssl/s3_pkt.c
+++ b/src/lib/libssl/s3_pkt.c
@@ -986,7 +986,8 @@ start:
 			if (rr->length == 0) {
 				s->rstate = SSL_ST_READ_HEADER;
 				rr->off = 0;
-				if (s->mode & SSL_MODE_RELEASE_BUFFERS)
+				if (s->mode & SSL_MODE_RELEASE_BUFFERS &&
+				    s->s3->rbuf.left == 0)
 					ssl3_release_read_buffer(s);
 			}
 		}
diff --git a/src/lib/libssl/src/ssl/s3_pkt.c b/src/lib/libssl/src/ssl/s3_pkt.c
index 52c48e945e..60c51146ac 100644
--- a/src/lib/libssl/src/ssl/s3_pkt.c
+++ b/src/lib/libssl/src/ssl/s3_pkt.c
@@ -986,7 +986,8 @@ start:
 			if (rr->length == 0) {
 				s->rstate = SSL_ST_READ_HEADER;
 				rr->off = 0;
-				if (s->mode & SSL_MODE_RELEASE_BUFFERS)
+				if (s->mode & SSL_MODE_RELEASE_BUFFERS &&
+				    s->s3->rbuf.left == 0)
 					ssl3_release_read_buffer(s);
 			}
 		}
-- 
cgit v1.2.3-55-g6feb