From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 449b1aeea70881b1c1cb228e644988ad38001497
Date: Mon, 19 Oct 2020 09:28:55 +0000 [thread overview]
Message-ID: <4CFBK40wzTz2xdB@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2633 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 449b1aeea70881b1c1cb228e644988ad38001497 (commit)
via badd010f86a816fa0c5eb951225bb9796b463ef2 (commit)
from 7ad39d931a81d21eb03d12b411840ff1e59b1be0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 449b1aeea70881b1c1cb228e644988ad38001497
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 19 09:26:17 2020 +0000
core152: Ship proxy.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit badd010f86a816fa0c5eb951225bb9796b463ef2
Author: Steffen Klammer <steffen.klammer(a)staderschulen.de>
Date: Fri Oct 16 10:08:52 2020 +0200
modified proxy.cgi to make it possible that all subnets declared in "network access control" will be translated from cidr to subnet notation in proxy.pac
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/152/filelists/files | 1 +
html/cgi-bin/proxy.cgi | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/core/152/filelists/files
index aaf469bce..1007ce32e 100644
--- a/config/rootfiles/core/152/filelists/files
+++ b/config/rootfiles/core/152/filelists/files
@@ -10,5 +10,6 @@ etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/red
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/proxy.cgi
usr/local/bin/setaliases
var/ipfire/graphs.pl
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index fdf9bddaf..a63e1c2df 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3004,7 +3004,8 @@ END
)
{
chomp $temp[1];
- print FILE " ||\n (isInNet(myIpAddress(), \"$temp[0]\", \"$temp[1]\"))";
+ my $tempmask = &Network::convert_prefix2netmask($temp[1]);
+ print FILE " ||\n (isInNet(myIpAddress(), \"$temp[0]\", \"$tempmask\"))";
}
}
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2020-10-19 9:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CFBK40wzTz2xdB@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox