[debian-edu-commits] debian-edu/ 01/05: wpad.dat: Use DIRECT connects for URL hosts being in network 127./8 and for hosts being in the .local domain. (Closes: #803911).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch jessie
in repository debian-edu-config.

commit c4fa9c2eccdac523aa58b2f5685ff5cfea21e5c5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Nov 3 06:37:31 2015 +0100

    wpad.dat: Use DIRECT connects for URL hosts being in network 127./8 and for hosts being in the .local domain. (Closes: #803911).
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog
---
 debian/changelog | 2 ++
 www/wpad.dat     | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ebe4b79..a751db9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ debian-edu-config (1.818+deb8u1) UNRELEASED; urgency=low
   * Set configVersion="Managed-by-Debian-Edu" in gosa.conf. (Closes: #794189).
     This requires gosa (>= 2.7.4+reloaded2-1+deb8u2~) to be installed on the
     main server.
+  * wpad.dat: Use DIRECT connects for URL hosts being in network 127./8 and
+    for hosts being in the .local domain. (Closes: #803911).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 16 May 2015 23:12:06 +0200
 
diff --git a/www/wpad.dat b/www/wpad.dat
index 5be7155..00092bc 100644
--- a/www/wpad.dat
+++ b/www/wpad.dat
@@ -2,8 +2,13 @@ function FindProxyForURL(url, host)
     {
         if (!isResolvable(host) ||
             isPlainHostName(host) ||
-            dnsDomainIs(host, ".intern"))
+            isInNet(host,"127.0.0.1","255.0.0.0") ||
+            dnsDomainIs(host, ".intern") ||
+            dnsDomainIs(host, ".local"))
+        {
             return "DIRECT";
-        else
+        }
+        else {
             return "PROXY webcache:3128; DIRECT";
+        }
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git