From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4ef4d82baa001e777dda0024dbf9159ca85b7721
Date: Wed, 14 Feb 2018 22:25:10 +0000 [thread overview]
Message-ID: <20180214222510.911551081BCF@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2326 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 4ef4d82baa001e777dda0024dbf9159ca85b7721 (commit)
via a2b2ac7854bd53548e9bcf75b468451ef2674e97 (commit)
from 0642dc892347078f7cbed528e160015b7456ca36 (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 4ef4d82baa001e777dda0024dbf9159ca85b7721
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Feb 14 22:23:20 2018 +0000
core119: Ship changed proxy.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a2b2ac7854bd53548e9bcf75b468451ef2674e97
Author: Bernhard Held <berny156(a)gmx.de>
Date: Mon Feb 12 23:25:47 2018 +0100
proxy.cgi: remove excessive newlines in generated proxy.pac
Remove excessive newlines in generated proxy.pac
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/119/filelists/files | 1 +
html/cgi-bin/proxy.cgi | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/119/filelists/files b/config/rootfiles/core/119/filelists/files
index 57a75db9a..053cb1278 100644
--- a/config/rootfiles/core/119/filelists/files
+++ b/config/rootfiles/core/119/filelists/files
@@ -4,4 +4,5 @@ etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/unbound
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
var/ipfire/langs
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 6aa14e15a..66ca86953 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3077,8 +3077,6 @@ END
print FILE "\n";
print FILE <<END
-
-
)
return "PROXY $netsettings{'GREEN_ADDRESS'}:$proxysettings{'PROXY_PORT'}";
END
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2018-02-14 22:25 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=20180214222510.911551081BCF@git01.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