mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-10 00:58:17 +02:00
[utils] Check for None values in SOCKS proxy
Originally reported at https://github.com/rg3/youtube-dl/pull/9287#issuecomment-219617864
This commit is contained in:
parent
36755d9d69
commit
cdd94c2eae
@ -883,12 +883,17 @@ def make_socks_conn_class(base_class, socks_proxy):
|
|||||||
elif url_components.scheme.lower() == 'socks4a':
|
elif url_components.scheme.lower() == 'socks4a':
|
||||||
socks_type = ProxyType.SOCKS4A
|
socks_type = ProxyType.SOCKS4A
|
||||||
|
|
||||||
|
def unquote_if_non_empty(s):
|
||||||
|
if not s:
|
||||||
|
return s
|
||||||
|
return compat_urllib_parse_unquote_plus(s)
|
||||||
|
|
||||||
proxy_args = (
|
proxy_args = (
|
||||||
socks_type,
|
socks_type,
|
||||||
url_components.hostname, url_components.port or 1080,
|
url_components.hostname, url_components.port or 1080,
|
||||||
True, # Remote DNS
|
True, # Remote DNS
|
||||||
compat_urllib_parse_unquote_plus(url_components.username),
|
unquote_if_non_empty(url_components.username),
|
||||||
compat_urllib_parse_unquote_plus(url_components.password),
|
unquote_if_non_empty(url_components.password),
|
||||||
)
|
)
|
||||||
|
|
||||||
class SocksConnection(base_class):
|
class SocksConnection(base_class):
|
||||||
|
Loading…
Reference in New Issue
Block a user