don't reload the pages more frequently than every 2 minutes

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index e102eb2..f02768b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+* Do not force a page reload more frequently than every 120s -- tobi
+
 2007/10/28 -- released version 2.2.6
 * removed some cruft from the release archive -- tobi
 * fixed release process to prevent furture cruft -- tobi
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index 46946e1..e2c0421 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -1421,8 +1421,9 @@ sub display_webpage($$){
         smokelogo => '<A HREF="http://oss.oetiker.ch/smokeping/counter.cgi/'.$VERSION.'"><img border="0" src="'.$cfg->{General}{imgurl}.'/smokeping.png"></a>',
        }
        );
+    my $expi = $cfg->{Database}{step} > 120 ? $cfg->{Database}{step} : 120;
     print $q->header(-type=>'text/html',
-                     -expires=>'+'.($cfg->{Database}{step}).'s',
+                     -expires=>'+'.$expi.'s',
                      -charset=> ( $cfg->{Presentation}{charset} || 'iso-8859-15'),
                      -Content_length => length($page),
                      );