|
Line
Link Here
|
| 0 |
-- a/lib/http/__init__.py |
0 |
++ b/lib/http/__init__.py |
|
Lines 88-93
Link Here
|
| 88 |
# send/receive quantum |
88 |
# send/receive quantum |
| 89 |
SOCK_BUF_SIZE = 32768 |
89 |
SOCK_BUF_SIZE = 32768 |
| 90 |
|
90 |
|
|
|
91 |
# OpenSSL.SSL.ConnectionType was deprecated in pyopenssl-19.1.0: |
| 92 |
try: |
| 93 |
ssl_conn_type = OpenSSL.SSL.Connection |
| 94 |
except AttributeError: |
| 95 |
ssl_conn_type = OpenSSL.SSL.ConnectionType |
| 96 |
|
| 91 |
|
97 |
|
| 92 |
class HttpError(Exception): |
98 |
class HttpError(Exception): |
| 93 |
"""Internal exception for HTTP errors. |
99 |
"""Internal exception for HTTP errors. |
|
Lines 377-383
Link Here
|
| 377 |
|
383 |
|
| 378 |
# Handshake is only supported by SSL sockets |
384 |
# Handshake is only supported by SSL sockets |
| 379 |
if (op == SOCKOP_HANDSHAKE and |
385 |
if (op == SOCKOP_HANDSHAKE and |
| 380 |
not isinstance(sock, OpenSSL.SSL.ConnectionType)): |
386 |
not isinstance(sock, ssl_conn_type)): |
| 381 |
return |
387 |
return |
| 382 |
|
388 |
|
| 383 |
# No override by default |
389 |
# No override by default |
|
Lines 414-420
Link Here
|
| 414 |
return sock.recv(arg1) |
420 |
return sock.recv(arg1) |
| 415 |
|
421 |
|
| 416 |
elif op == SOCKOP_SHUTDOWN: |
422 |
elif op == SOCKOP_SHUTDOWN: |
| 417 |
if isinstance(sock, OpenSSL.SSL.ConnectionType): |
423 |
if isinstance(sock, ssl_conn_type): |
| 418 |
# PyOpenSSL's shutdown() doesn't take arguments |
424 |
# PyOpenSSL's shutdown() doesn't take arguments |
| 419 |
return sock.shutdown() |
425 |
return sock.shutdown() |
| 420 |
else: |
426 |
else: |
