Bug #16103
Support for SOCKS proxies in HTTP, HTTPS, and FTP protocols.
Also includes the prefs configuration and UI bits.
This commit is contained in:
jab%atdot.org 2006-05-17 02:26:08 +00:00
parent f9f1947f3c
commit bc877fee4d
3 changed files with 18 additions and 3 deletions

View File

@ -26,12 +26,14 @@ function DoEnabling()
var httpPort = document.getElementById("networkProxyHTTP_Port");
var ssl = document.getElementById("networkProxySSL");
var sslPort = document.getElementById("networkProxySSL_Port");
var socks = document.getElementById("networkProxySOCKS");
var socksPort = document.getElementById("networkProxySOCKS_Port");
var noProxy = document.getElementById("networkProxyNone");
var autoURL = document.getElementById("networkProxyAutoconfigURL");
var autoReload = document.getElementById("autoReload");
// convenience arrays
var manual = [ftp, ftpPort, http, httpPort, ssl, sslPort, noProxy];
var manual = [ftp, ftpPort, http, httpPort, ssl, sslPort, socks, socksPort, noProxy];
var auto = [autoURL, autoReload];
// radio buttons

View File

@ -32,7 +32,7 @@
<script language="JavaScript">
<![CDATA[
_elementIDs = ["networkProxyType", "networkProxyFTP", "networkProxyFTP_Port", "networkProxyHTTP", "networkProxyHTTP_Port", "networkProxySSL", "networkProxySSL_Port", "networkProxyNone", "networkProxyAutoconfigURL"];
_elementIDs = ["networkProxyType", "networkProxyFTP", "networkProxyFTP_Port", "networkProxyHTTP", "networkProxyHTTP_Port", "networkProxySSL", "networkProxySSL_Port", "networkProxySOCKS", "networkProxySOCKS_Port", "networkProxyNone", "networkProxyAutoconfigURL"];
]]>
</script>
@ -88,6 +88,16 @@
prefattribute="value" size="5"/>
</box>
</row>
<row>
<text class="label" value="&socks.label;" accesskey="&socks.accesskey;" for="networkProxySOCKS"/>
<box autostretch="never">
<textfield id="networkProxySOCKS" pref="true" preftype="string" prefstring="network.proxy.socks"
prefattribute="value" flex="1"/>
<text class="label" value="&port.label;" accesskey="&SOCKSport.accesskey;" for="networkProxySOCKS_Port"/>
<textfield id="networkProxySOCKS_Port" pref="true" preftype="int" prefstring="network.proxy.socks_port"
prefattribute="value" size="5"/>
</box>
</row>
<row>
<text class="label" value="&noproxy.label;" accesskey="&noproxy.accesskey;" for="networkProxyNone"/>
<textfield id="networkProxyNone" pref="true" preftype="string" prefstring="network.proxy.no_proxies_on"

View File

@ -21,9 +21,12 @@
<!ENTITY http.accesskey "h">
<!ENTITY ssl.label "SSL Proxy:">
<!ENTITY ssl.accesskey "s">
<!ENTITY socks.label "SOCKS Host:">
<!ENTITY socks.accesskey "c">
<!ENTITY port.label "Port:">
<!ENTITY FTPport.accesskey "o">
<!ENTITY HTTPport.accesskey "p">
<!ENTITY SSLport.accesskey "t">
<!ENTITY SOCKSport.accesskey "g">
<!ENTITY noproxy.label "No Proxy for:">
<!ENTITY noproxy.accesskey "n">