aboutsummaryrefslogtreecommitdiffstats
path: root/gallery_dl/extractor/common.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@unit193.net>2024-12-08 20:34:39 -0500
committerLibravatarUnit 193 <unit193@unit193.net>2024-12-08 20:34:39 -0500
commit955a18e4feea86fdb35e531a00304e00d037652c (patch)
tree06060068ebe725be4294758b2caca3e2491ef4f0 /gallery_dl/extractor/common.py
parent402872c8ca0118f5ed9c172d3c11dac90dd41c37 (diff)
parentf6877087773089220d68288d055276fca6c556d4 (diff)
Update upstream source from tag 'upstream/1.28.1'
Update to upstream version '1.28.1' with Debian dir f1535f052953f6a9195352a951ec8dd121144a27
Diffstat (limited to 'gallery_dl/extractor/common.py')
-rw-r--r--gallery_dl/extractor/common.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py
index f364124..5f9d355 100644
--- a/gallery_dl/extractor/common.py
+++ b/gallery_dl/extractor/common.py
@@ -348,7 +348,7 @@ class Extractor():
ssl_options = ssl_ciphers = 0
# .netrc Authorization headers are alwsays disabled
- session.trust_env = True if self.config("proxy-env", False) else False
+ session.trust_env = True if self.config("proxy-env", True) else False
browser = self.config("browser")
if browser is None:
@@ -387,8 +387,8 @@ class Extractor():
useragent = self.useragent
elif useragent == "browser":
useragent = _browser_useragent()
- elif useragent is config.get(("extractor",), "user-agent") and \
- useragent == Extractor.useragent:
+ elif self.useragent is not Extractor.useragent and \
+ useragent is config.get(("extractor",), "user-agent"):
useragent = self.useragent
headers["User-Agent"] = useragent
headers["Accept"] = "*/*"