[pypy-commit] pypy release-pypy2.7-5.x: merge default

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: release-pypy2.7-5.x
Changeset: r92486:e3ab7b0bd8ac
Date: 2017-09-27 12:42 -0700
http://bitbucket.org/pypy/pypy/changeset/e3ab7b0bd8ac/

Log:	merge default

diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/module/_ssl/interp_ssl.py
@@ -283,6 +283,7 @@
         sock_fd = space.int_w(space.call_method(w_sock, "fileno"))
         self.ssl = libssl_SSL_new(w_ctx.ctx)  # new ssl struct
 
+        rgc.add_memory_pressure(6 * 1024)
         self.register_finalizer(space)
 
         index = compute_unique_id(self)