diff options
| author | Florian Bruhin <git@the-compiler.org> | 2017-02-22 07:42:57 +0100 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2017-02-22 07:42:57 +0100 |
| commit | f952da16beb85f470b8c658af0a00c888c0cfa71 (patch) | |
| tree | 2baefe70978582ad02a0487e283f76bddf71f86f | |
| parent | e8443241df0da7fb78cceccaafd6c856fcd850dd (diff) | |
| parent | a32f57b7051cdce083d27bf6342f6a1e5d0c527f (diff) | |
| download | qutebrowser-f952da16beb85f470b8c658af0a00c888c0cfa71.tar.gz qutebrowser-f952da16beb85f470b8c658af0a00c888c0cfa71.zip | |
Merge branch 'kiryl-pac+file'
| -rw-r--r-- | CHANGELOG.asciidoc | 2 | ||||
| -rw-r--r-- | README.asciidoc | 1 | ||||
| -rw-r--r-- | qutebrowser/utils/urlutils.py | 2 | ||||
| -rw-r--r-- | tests/unit/config/test_configtypes.py | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 851c68cbc..dcbcec1c7 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -45,6 +45,8 @@ Changed - qutebrowser now automatically uses QtWebEngine if QtWebKit is unavailable - :history-clear now asks for a confirmation, unless it's run with --force. - `input -> mouse-zoom-divider` can now be 0 to disable zooming by mouse wheel +- `network -> proxy` can also be set to `pac+file://...` now to + use a local proxy autoconfig file (on QtWebKit) Fixed ----- diff --git a/README.asciidoc b/README.asciidoc index 2bbe9db60..be3211dc4 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -265,6 +265,7 @@ Contributors, sorted by the number of commits in descending order: * Matthias Lisin * Marcel Schilling * Lazlow Carmichael +* Kirill A. Shutemov * Kevin Wang * Ján Kobezda * Johannes Martinsson diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py index 7e3827fcd..1beebbe92 100644 --- a/qutebrowser/utils/urlutils.py +++ b/qutebrowser/utils/urlutils.py @@ -613,7 +613,7 @@ def proxy_from_url(url): raise InvalidUrlError(url) scheme = url.scheme() - if scheme in ['pac+http', 'pac+https']: + if scheme in ['pac+http', 'pac+https', 'pac+file']: return pac.PACFetcher(url) types = { diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py index 1425ad367..f5f66b7f4 100644 --- a/tests/unit/config/test_configtypes.py +++ b/tests/unit/config/test_configtypes.py @@ -1483,6 +1483,7 @@ class TestProxy: 'none', 'http://user:pass@example.com:2323/', 'pac+http://example.com/proxy.pac', + 'pac+file:///tmp/proxy.pac' ]) def test_validate_valid(self, klass, val): klass(none_ok=True).validate(val) |