diff --git a/fhem/CHANGED b/fhem/CHANGED index 178aff9ff..8168927a9 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: 57_Calendar: new attribute timeout - change: 10_KNX: major rewrite of the module. pls. check forum https://forum.fhem.de/index.php/topic,122582.0.html before shutdown/restart! diff --git a/fhem/FHEM/57_Calendar.pm b/fhem/FHEM/57_Calendar.pm index 0320cb421..d49858f4d 100644 --- a/fhem/FHEM/57_Calendar.pm +++ b/fhem/FHEM/57_Calendar.pm @@ -1736,6 +1736,7 @@ sub Calendar_Initialize($) { $hash->{AttrList}= "update:none,onUrlChanged ". "synchronousUpdate:0,1 ". "delay " . + "timeout " . "removevcalendar:0,1 " . "ignoreCancelled:0,1 ". "SSLVerify:0,1 ". @@ -2619,12 +2620,13 @@ sub Calendar_GetUpdate($$$;$) { } } + my $timeout= AttrVal($name, "timeout", 30); HttpUtils_NonblockingGet({ url => $url, hideurl => 1, noshutdown => 1, hash => $hash, - timeout => 30, + timeout => $timeout, type => 'caldata', removeall => $removeall, sslargs => $SSLArgs, @@ -3739,6 +3741,12 @@ sub CalendarEventsAsHtml($;$) { load error rates.
+
timeout <time>+
removevcalendar 0|1get <name> vcalendar is then no longer possible.
@@ -4395,13 +4403,19 @@ sub CalendarEventsAsHtml($;$) {
URL seit dem letzten Aufruf verändert hat, insbesondere nach der Auswertung von wildcards im define.-
delay <time>delay <time>+
timeout <time>+
removevcalendar 0|1