Merge branch 'do_not_archive' into qa

This commit is contained in:
Barbara Miller 2018-02-20 10:48:53 -08:00
commit 9f2b64685b

View File

@ -64,6 +64,7 @@ import urlcanon
import time
import collections
import cProfile
from urllib3.util.ssl_ import DEFAULT_CIPHERS
class ProxyingRecorder(object):
"""
@ -257,6 +258,7 @@ class MitmProxyHandler(http_server.BaseHTTPRequestHandler):
context = ssl.create_default_context()
context.check_hostname = False
context.verify_mode = ssl.CERT_NONE
context.ciphers = DEFAULT_CIPHERS
self._remote_server_sock = context.wrap_socket(
self._remote_server_sock, server_hostname=self.hostname)
except AttributeError: