projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release 2020.03.01
[youtube-dl]
/
youtube_dl
/
socks.py
diff --git
a/youtube_dl/socks.py
b/youtube_dl/socks.py
index 0f5d7bdb2128b17c2e1dba3144ff01d9b3d2f06a..5d4adbe72de5d273a11f0fc2d66b7829c4bbfb37 100644
(file)
--- a/
youtube_dl/socks.py
+++ b/
youtube_dl/socks.py
@@
-193,9
+193,10
@@
class sockssocket(socket.socket):
self._check_response_version(SOCKS5_VERSION, version)
self._check_response_version(SOCKS5_VERSION, version)
- if method == Socks5Auth.AUTH_NO_ACCEPTABLE:
+ if method == Socks5Auth.AUTH_NO_ACCEPTABLE or (
+ method == Socks5Auth.AUTH_USER_PASS and (not self._proxy.username or not self._proxy.password)):
self.close()
self.close()
- raise Socks5Error(
method
)
+ raise Socks5Error(
Socks5Auth.AUTH_NO_ACCEPTABLE
)
if method == Socks5Auth.AUTH_USER_PASS:
username = self._proxy.username.encode('utf-8')
if method == Socks5Auth.AUTH_USER_PASS:
username = self._proxy.username.encode('utf-8')