From de088c18b9c9efdc37fc5b4229179ec7ed25d748 Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <kirill@shutemov.name>
Date: Tue, 21 Feb 2017 12:57:18 +0300
Subject: [PATCH 1/2] Allow pac+file proxy scheme to load PAC file from local
 filesystem

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
---
 qutebrowser/utils/urlutils.py         | 2 +-
 tests/unit/config/test_configtypes.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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)

From a32f57b7051cdce083d27bf6342f6a1e5d0c527f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 22 Feb 2017 07:42:45 +0100
Subject: [PATCH 2/2] Update docs

---
 CHANGELOG.asciidoc | 2 ++
 README.asciidoc    | 1 +
 2 files changed, 3 insertions(+)

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