|
[-]
[+]
|
Changed |
awstats-6.8-www_SiteConfig.patch
|
| @@ -1,10 +1,10 @@
---- wwwroot/cgi-bin/awstats.pl.orig 2008-11-15 19:55:25.000000000 +0100
-+++ wwwroot/cgi-bin/awstats.pl 2008-11-15 19:57:21.000000000 +0100
+--- wwwroot/cgi-bin/awstats.pl.orig 2008-11-15 20:44:33.000000000 +0100
++++ wwwroot/cgi-bin/awstats.pl 2008-11-15 20:49:01.000000000 +0100
@@ -1173,6 +1173,7 @@
my $searchdir=$_;
if ($searchdir && $searchdir !~ /[\\\/]$/) { $searchdir .= "/"; }
- if (open(CONFIG,"$searchdir$PROG.$SiteConfig.conf")) { $FileConfig="$searchdir$PROG.$SiteConfig.conf"; $FileSuffix=".$SiteConfig"; last; }
-+ if (open(CONFIG,"$searchdir$PROG.www.$SiteConfig.conf")) { $FileConfig="$searchdir$PROG.www.$SiteConfig.conf"; $FileSuffix=".www.$SiteConfig"; last; }
- if (open(CONFIG,"$searchdir$PROG.conf")) { $FileConfig="$searchdir$PROG.conf"; $FileSuffix=''; last; }
+ if (open(CONFIG,"<$searchdir$PROG.$SiteConfig.conf")) { $FileConfig="$searchdir$PROG.$SiteConfig.conf"; $FileSuffix=".$SiteConfig"; last; }
++ if (open(CONFIG,"<$searchdir$PROG.www.$SiteConfig.conf")) { $FileConfig="$searchdir$PROG.www.$SiteConfig.conf"; $FileSuffix=".www.$SiteConfig"; last; }
+ if (open(CONFIG,"<$searchdir$PROG.conf")) { $FileConfig="$searchdir$PROG.conf"; $FileSuffix=''; last; }
}
if (! $FileConfig) { error("Couldn't open config file \"$PROG.$SiteConfig.conf\" nor \"$PROG.conf\" after searching in path \"".join(',',@PossibleConfigDir)."\": $!"); }
|
|
[-]
[+]
|
Added |
awstats-6.8-www_SiteConfig.patch_plain
^
|
| @@ -0,0 +1,10 @@
+--- wwwroot/cgi-bin/awstats.pl.orig 2008-11-15 19:55:25.000000000 +0100
++++ wwwroot/cgi-bin/awstats.pl 2008-11-15 19:57:21.000000000 +0100
+@@ -1173,6 +1173,7 @@
+ my $searchdir=$_;
+ if ($searchdir && $searchdir !~ /[\\\/]$/) { $searchdir .= "/"; }
+ if (open(CONFIG,"$searchdir$PROG.$SiteConfig.conf")) { $FileConfig="$searchdir$PROG.$SiteConfig.conf"; $FileSuffix=".$SiteConfig"; last; }
++ if (open(CONFIG,"$searchdir$PROG.www.$SiteConfig.conf")) { $FileConfig="$searchdir$PROG.www.$SiteConfig.conf"; $FileSuffix=".www.$SiteConfig"; last; }
+ if (open(CONFIG,"$searchdir$PROG.conf")) { $FileConfig="$searchdir$PROG.conf"; $FileSuffix=''; last; }
+ }
+ if (! $FileConfig) { error("Couldn't open config file \"$PROG.$SiteConfig.conf\" nor \"$PROG.conf\" after searching in path \"".join(',',@PossibleConfigDir)."\": $!"); }
|
