commit 623754c8755b05bea57f06d1838cd7805c141e29
author Brian Carlstrom <bdc@google.com> Thu Jan 17 20:23:11 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 17 20:23:11 2013 +0000
tree 348b5c2708340648a6d7d9af06eaddb60365ba43
parent 0acb36e3a494c7e2e7601d2b5698045c30c69316
parent 0617166064042db795122e2109a17f4e7d4a936b

Merge "Move from Android SSL_MODE_SMALL_BUFFERS to OpenSSL v1.0.1 SSL_MODE_RELEASE_BUFFERS"

luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp

diff --git a/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp b/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
index f1932ea..01eedbf 100644
--- a/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
+++ b/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
@@ -3776,10 +3776,10 @@
      * and undesirable.)
      */
     mode |= SSL_MODE_ENABLE_PARTIAL_WRITE;
-#if defined(SSL_MODE_SMALL_BUFFERS) /* not all SSL versions have this */
-    mode |= SSL_MODE_SMALL_BUFFERS;  /* lazily allocate record buffers; usually saves
-                                      * 44k over the default */
-#endif
+
+    // Reuse empty buffers within the SSL_CTX to save memory
+    mode |= SSL_MODE_RELEASE_BUFFERS;
+
     SSL_CTX_set_mode(sslCtx.get(), mode);
 
     SSL_CTX_set_cert_verify_callback(sslCtx.get(), cert_verify_callback, NULL);