From: Stephen L Johnson Date: Wed, 29 Nov 2000 16:47:27 +0000 (+0000) Subject: fixed problem in new spong.hosts based parameters code X-Git-Tag: spong-2_7_2~49 X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df312e28d883e74cd997b90a3f72de1c79864ef6;p=spong.git fixed problem in new spong.hosts based parameters code --- diff --git a/src/lib/Spong/Network/plugins/check_http b/src/lib/Spong/Network/plugins/check_http index 1738263..f807216 100755 --- a/src/lib/Spong/Network/plugins/check_http +++ b/src/lib/Spong/Network/plugins/check_http @@ -10,11 +10,13 @@ sub check_http { my( $host ) = @_; my( @http_files ) = ( @{$HTTPDOCS{"ALL"}}, @{$HTTPDOCS{$host}} ); my( $http_port ) = $HTTPPORT{$host} || $HTTPPORT{"ALL"} || 80; + # Find list of URL's to check - my( @http_urls ) = @{$HTTPURLS{$host}} || # Old style configs - @{$HTTPURLS{'DEFAULT'}} || - $HOSTS{$host}->{'http_urls'} || # New style configs - $HOSTS_DEFAULTS{'http_urls'}; + my( @http_urls ) = @{$HTTPURLS{$host}}; + @http_urls = @{$HTTPURLS{'DEFAULT'}} if( ! @http_urls ); + @http_urls = @{$HOSTS{$host}->{'http_urls'}} if( ! @http_urls ); + @http_urls = @{$HOSTS_DEFAULTS{'http_urls'}} if( ! @http_urls ); + # Append mandatory urls to check @http_urls = ( @http_urls, @{$HOSTS_ALL{'http_urls'}} );