From f33f2e0a0f23be66d3d6e3aa9b5a8c00fbb15a9c Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 20 May 2014 04:23:24 +0200 Subject: [PATCH] Convert URL to proxy correctly. Before, user/password was set to an empty string even when not set in the URL, causing Qt to reread this information all the time and call proxyAuthenticationRequired even when the entered info was correct. --- qutebrowser/config/_conftypes.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/qutebrowser/config/_conftypes.py b/qutebrowser/config/_conftypes.py index 66548474f..8c1d54f7e 100644 --- a/qutebrowser/config/_conftypes.py +++ b/qutebrowser/config/_conftypes.py @@ -677,9 +677,16 @@ class Proxy(BaseType): url = QUrl(value) if (url.isValid() and not url.isEmpty() and url.scheme() in self.PROXY_TYPES): - return - raise ValidationError(value, "must be a proxy URL (http://... or " - "socks://...) or system/none!") + if url.userName() and url.password(): + pass + elif not url.userName() and not url.password(): + pass + else: + raise ValidationError(value, "must either have user and " + "password or none of both") + else: + raise ValidationError(value, "must be a proxy URL (http://... or " + "socks://...) or system/none!") def complete(self): out = [] @@ -696,8 +703,14 @@ class Proxy(BaseType): return QNetworkProxy(QNetworkProxy.NoProxy) url = QUrl(value) typ = self.PROXY_TYPES[url.scheme()] - return QNetworkProxy(typ, url.host(), url.port(), url.userName(), - url.password()) + proxy = QNetworkProxy(typ, url.host()) + if url.port() != -1: + proxy.setPort(url.port()) + if url.userName(): + proxy.setUser(url.userName()) + if url.password(): + proxy.setPassword(url.password()) + return proxy class SearchEngineName(BaseType):