summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--paramiko/compress.py3
-rw-r--r--sites/www/changelog.rst3
2 files changed, 5 insertions, 1 deletions
diff --git a/paramiko/compress.py b/paramiko/compress.py
index b55f0b1d..5073109c 100644
--- a/paramiko/compress.py
+++ b/paramiko/compress.py
@@ -25,7 +25,8 @@ import zlib
class ZlibCompressor (object):
def __init__(self):
- self.z = zlib.compressobj(9)
+ # Use the default level of zlib compression
+ self.z = zlib.compressobj()
def __call__(self, data):
return self.z.compress(data) + self.z.flush(zlib.Z_FULL_FLUSH)
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 9de287ae..5daa9243 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :bug:`60` Improved the performance of compressed transport by using default
+ zlib compression level (which is 6) rather than the max level of 9 which is
+ very CPU intensive.
* :support:`-` Display exception type and message when logging auth-rejection
messages (ones reading ``Auth rejected: unsupported or mangled public key``);
previously this error case had a bare except and did not display exactly why