From c22287b5175a92ab5da7499b76bc334c2021383c Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 18 May 2017 18:13:12 +0200
Subject: [PATCH] portalHelper: Don't go through proxies for captive portals

When using an SSH tunnel (through a SOCKS proxy) to funnel all
the outgoing traffic, we need the captive portal to not go through that
proxy, otherwise we can't go through the proxy because we're not
connected to the Internet and we can't go through the portal because
we're not connected through the proxy.

This fixes a blank captive portal window and no error reporting in that
particular configuration.

https://bugzilla.gnome.org/show_bug.cgi?id=769692
---
 js/portalHelper/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js
index b721f6a0f..39e0c2b54 100644
--- a/js/portalHelper/main.js
+++ b/js/portalHelper/main.js
@@ -143,6 +143,7 @@ const PortalWindow = new Lang.Class({
 
         this._webContext = WebKit.WebContext.new_ephemeral();
         this._webContext.set_cache_model(WebKit.CacheModel.DOCUMENT_VIEWER);
+        this._webContext.set_network_proxy_settings(WebKit.NetworkProxyMode.NO_PROXY, null);
 
         this._webView = WebKit.WebView.new_with_context(this._webContext);
         this._webView.connect('decide-policy', Lang.bind(this, this._onDecidePolicy));