Browse Source

Minor fixes to proxy patch

csagan5 4 years ago
parent
commit
9b30907ddd
1 changed files with 2 additions and 2 deletions
  1. 2 2
      build/patches/Add-a-proxy-configuration-page.patch

+ 2 - 2
build/patches/Add-a-proxy-configuration-page.patch

@@ -225,7 +225,7 @@ new file mode 100644
 +          <input type="radio" id="use-single-list" name="mode" value="use-single-list"><label for="use-single-list">Use a single proxy list for all schemes (<a target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_(PAC)_file#Description">PAC format</a>):
 +          <input type="radio" id="use-single-list" name="mode" value="use-single-list"><label for="use-single-list">Use a single proxy list for all schemes (<a target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_(PAC)_file#Description">PAC format</a>):
 +              <textarea id="single-proxies"></textarea>
 +              <textarea id="single-proxies"></textarea>
 +            </label><br/>
 +            </label><br/>
-+          <input type="radio" id="use-list-per-scheme" name="mode" value="use-list-per-scheme"><label for="use-list-per-scheme">Use a proxy list per scheme (use ; as separator):</label><br/>
++          <input type="radio" id="use-list-per-scheme" name="mode" value="use-list-per-scheme"><label for="use-list-per-scheme">Use a proxy list per scheme:</label><br/>
 +              <label for="use-list-per-scheme">HTTP (<a target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_(PAC)_file#Description">PAC format</a>):<br/>
 +              <label for="use-list-per-scheme">HTTP (<a target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_(PAC)_file#Description">PAC format</a>):<br/>
 +              <textarea id="http-proxies"></textarea></label><br/>
 +              <textarea id="http-proxies"></textarea></label><br/>
 +              <label for="use-list-per-scheme">HTTPS (<a target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_(PAC)_file#Description">PAC format</a>):<br/>
 +              <label for="use-list-per-scheme">HTTPS (<a target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_(PAC)_file#Description">PAC format</a>):<br/>
@@ -1180,7 +1180,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +    return "";
 +    return "";
 +  }
 +  }
 +
 +
-+  // special case: a single proxy server specified
++  // special case: a single proxy servers list specified
 +  if (type == Type::PROXY_LIST) {
 +  if (type == Type::PROXY_LIST) {
 +    std::string proxy_list;
 +    std::string proxy_list;
 +    for (const ProxyServer& proxy_server :
 +    for (const ProxyServer& proxy_server :