Author: Armin Rigo <[email protected]>
Branch: py3.5
Changeset: r89633:f94e694e3ca5
Date: 2017-01-17 16:32 +0100
http://bitbucket.org/pypy/pypy/changeset/f94e694e3ca5/
Log: merge heads
diff --git a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
@@ -527,12 +527,12 @@
return None
comp_method = lib.SSL_get_current_compression(self.ssl);
- if comp_method == ffi.NULL: # or comp_method.type == lib.NID_undef:
+ if comp_method == ffi.NULL: # or lib.SSL_COMP_get_type(comp_method) ==
lib.NID_undef:
return None
short_name = lib.SSL_COMP_get_name(comp_method)
if short_name == ffi.NULL:
return None
- return _fs_decode(_str_from_buf(short_name))
+ return _cstr_decode_fs(short_name)
def version(self):
if self.ssl == ffi.NULL:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
