[debian-edu-commits] debian-edu/ 01/01: 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
sunweaver at debian.org
Tue Nov 3 05:38:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository debian-edu-config.
commit a0e0c55e3473be75cbdb1f3d14e7d64415383af1
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).
---
debian/changelog | 2 ++
www/wpad.dat | 9 +++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 501d942..26a2887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,8 @@ debian-edu-config (1.819) UNRELEASED; urgency=low
bootstrap.
* etc/gosa/gosa.conf: Typo fix in comment.
* LDAP bootstrap: Create generic host (CNAME record for tjener) ipp.intern.
+ * 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
More information about the debian-edu-commits
mailing list