rename 'disabletls12' to 'tls12'

and let config options override any default settings
This commit is contained in:
Mike Fährmann
2022-02-01 01:37:03 +01:00
parent bb3e182562
commit 7e6981dda6
2 changed files with 6 additions and 3 deletions

View File

@@ -38,7 +38,7 @@ class Extractor():
request_interval = 0.0
request_interval_min = 0.0
request_timestamp = 0.0
disabletls12 = False
tls12 = True
def __init__(self, match):
self.log = logging.getLogger(self.category)
@@ -277,7 +277,10 @@ class Extractor():
else:
source_address = (source_address[0], source_address[1])
if self.config("disabletls12") or self.disabletls12:
tls12 = self.config("tls12")
if tls12 is None:
tls12 = self.tls12
if not tls12:
ssl_options |= ssl.OP_NO_TLSv1_2
self.log.debug("TLS 1.2 disabled.")

View File

@@ -25,8 +25,8 @@ class PatreonExtractor(Extractor):
filename_fmt = "{id}_{title}_{num:>02}.{extension}"
archive_fmt = "{id}_{num}"
browser = "firefox"
tls12 = False
_warning = True
disabletls12 = True
def items(self):