diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-02-15 17:06:32 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-15 17:06:32 +0100 |
| commit | a1190c369648438811daae70c1baff4e32b198fd (patch) | |
| tree | 52f5ac21d67c6ae4e9a3604ae7f117c72b7522c5 /netlib | |
| parent | b211bef9a161f2dd587b94d942a5d3bf9d668b0d (diff) | |
| download | mitmproxy-a1190c369648438811daae70c1baff4e32b198fd.tar.gz mitmproxy-a1190c369648438811daae70c1baff4e32b198fd.tar.bz2 mitmproxy-a1190c369648438811daae70c1baff4e32b198fd.zip | |
adjust travis
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/.coveragerc | 11 | ||||
| -rw-r--r-- | netlib/netlib/tcp.py | 5 |
2 files changed, 4 insertions, 12 deletions
diff --git a/netlib/.coveragerc b/netlib/.coveragerc deleted file mode 100644 index ccbebf8c..00000000 --- a/netlib/.coveragerc +++ /dev/null @@ -1,11 +0,0 @@ -[run] -branch = True - -[report] -show_missing = True -include = *netlib/netlib* -exclude_lines = - pragma: nocover - pragma: no cover - raise NotImplementedError() -omit = *contrib* diff --git a/netlib/netlib/tcp.py b/netlib/netlib/tcp.py index c8548aea..61b41cdc 100644 --- a/netlib/netlib/tcp.py +++ b/netlib/netlib/tcp.py @@ -31,7 +31,10 @@ else: socket_fileobject = socket.SocketIO EINTR = 4 -HAS_ALPN = OpenSSL._util.lib.Cryptography_HAS_ALPN +if os.environ.get("NO_ALPN"): + HAS_ALPN = False +else: + HAS_ALPN = OpenSSL._util.lib.Cryptography_HAS_ALPN # To enable all SSL methods use: SSLv23 # then add options to disable certain methods |