Author: glen Date: Sat Jan 7 17:18:44 2012 GMT Module: packages Tag: HEAD ---- Log message: - prefer HTTP_HOST for locating self url
---- Files affected: packages/nagios-vshell: nagios-vshell.spec (1.3 -> 1.4) , http-host.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/nagios-vshell/nagios-vshell.spec diff -u packages/nagios-vshell/nagios-vshell.spec:1.3 packages/nagios-vshell/nagios-vshell.spec:1.4 --- packages/nagios-vshell/nagios-vshell.spec:1.3 Sat Jan 7 18:16:44 2012 +++ packages/nagios-vshell/nagios-vshell.spec Sat Jan 7 18:18:39 2012 @@ -12,6 +12,7 @@ # Source0-md5: 802a80daa263b441af1b729cb3e7fa35 Source1: apache.conf Patch0: config.patch +Patch1: http-host.patch URL: http://exchange.nagios.org/directory/Addons/Frontends-(GUIs-and-CLIs)/Web-Interfaces/Nagios-V-2DShell/details Requires: nagios-cgi Requires: webapps @@ -36,6 +37,7 @@ %setup -qc mv %{pkg}/* . %patch0 -p1 +%patch1 -p1 # standard license doc/gpl.txt @@ -83,6 +85,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2012/01/07 17:18:39 glen +- prefer HTTP_HOST for locating self url + Revision 1.3 2012/01/07 17:16:44 glen - use own apache config ================================================================ Index: packages/nagios-vshell/http-host.patch diff -u /dev/null packages/nagios-vshell/http-host.patch:1.1 --- /dev/null Sat Jan 7 18:18:45 2012 +++ packages/nagios-vshell/http-host.patch Sat Jan 7 18:18:39 2012 @@ -0,0 +1,13 @@ +--- nagios-vshell-1.8/constants.inc.php~ 2012-01-07 19:10:19.199751130 +0200 ++++ nagios-vshell-1.8/constants.inc.php 2012-01-07 19:16:22.191650914 +0200 +@@ -52,8 +52,8 @@ + + ///////////////patch submitted by Dave Worth 11/18/2010 + //add support for https +-$SERVER_BASE = isset($_SERVER['SERVER_NAME']) ? +- $_SERVER['SERVER_NAME'] : $_SERVER['SERVER_ADDR']; ++$SERVER_BASE = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ++ (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['SERVER_ADDR']); + + $PROTO = isset($_SERVER['HTTPS']) ? 'https' : 'http'; + $base = $PROTO.'://'.$SERVER_BASE; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-vshell/nagios-vshell.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
