From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Sat, 2 Apr 2011 12:32:31 +0000 (+0200)
Subject: Fixded localhost webservers are directed to the proxy if auto
X-Git-Tag: v2.9-core49~39^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3341bc21612b4036801b32d6679fa3d17ca0d99;p=people%2Fstevee%2Fipfire-2.x.git

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 0037af1833..d4ff5e242c 100644
--- a/config/rootfiles/core/49/filelists/files
+++ b/config/rootfiles/core/49/filelists/files
@@ -1 +1,2 @@
 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 8b3200dab4..fc65e7a1b1 100644
--- 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'}")) ||
+     (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")) ||