diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2015-09-21 18:51:44 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2015-09-21 18:51:44 +0200 |
| commit | 21579f0add33c8c3f743896b5ab1b390eef00356 (patch) | |
| tree | c1778bba4ad07ffa71a8d596430c55ff45aaa7db /netlib/tcp.py | |
| parent | 1ff8f294b459e03e113acb417678a6fd782c2685 (diff) | |
| parent | e9fe45f3f404bb1c762dfb13477072c06d4b74ec (diff) | |
| download | mitmproxy-21579f0add33c8c3f743896b5ab1b390eef00356.tar.gz mitmproxy-21579f0add33c8c3f743896b5ab1b390eef00356.tar.bz2 mitmproxy-21579f0add33c8c3f743896b5ab1b390eef00356.zip | |
Merge pull request #98 from Kriechi/master
backport changes
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index 40ffbd48..b751d71f 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -279,6 +279,7 @@ class Reader(_FileLike): if tuple(int(x) for x in OpenSSL.__version__.split(".")[:2]) > (0, 15): return self.o.recv(length, socket.MSG_PEEK) else: + # TODO: remove once a new version is released # Polyfill for pyOpenSSL <= 0.15.1 # Taken from https://github.com/pyca/pyopenssl/commit/1d95dea7fea03c7c0df345a5ea30c12d8a0378d2 buf = SSL._ffi.new("char[]", length) |