Fixded localhost webservers are directed to the proxy if auto

configuration is used.

Fixes bug #770

diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files
index 0037af183326a74f3cbb5f65b2cf4c007eea7bed..d4ff5e242c6a191b19f79399d10083452616611d 100644 (file)
--- a/config/rootfiles/core/49/filelists/files
+++ b/config/rootfiles/core/49/filelists/files
@@ -1 +1,2 @@
 etc/system-release
 etc/system-release

+srv/web/ipfire/cgi-bin/proxy.cgi

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 8b3200dab4306eb570857f416f518c73c0cbf680..fc65e7a1b1d573f6ae4b27ac03cbeacaff7e257f 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -2924,6 +2924,7 @@ sub writepacfile
 if (
      (isPlainHostName(host)) ||
      (dnsDomainIs(host, ".$mainsettings{'DOMAINNAME'}")) ||
 if (
      (isPlainHostName(host)) ||
      (dnsDomainIs(host, ".$mainsettings{'DOMAINNAME'}")) ||

+     (isInNet(host, "127.0.0.1", "255.0.0")) ||

      (isInNet(host, "10.0.0.0", "255.0.0.0")) ||
      (isInNet(host, "172.16.0.0", "255.240.0.0")) ||
      (isInNet(host, "192.168.0.0", "255.255.0.0")) ||
      (isInNet(host, "10.0.0.0", "255.0.0.0")) ||
      (isInNet(host, "172.16.0.0", "255.240.0.0")) ||
      (isInNet(host, "192.168.0.0", "255.255.0.0")) ||