FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-23 14:46:24 +00:00
Code Issues Releases Wiki Activity

98_HTTPMOD: bug fixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23011 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
StefanStrobel 2020-10-23 15:03:23 +00:00
parent 8068feb5af
commit 7ab80767ad
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/98_HTTPMOD.pm
View File

@ -140,7 +140,7 @@ BEGIN {
)); ));
}; };
my $Module_Version = '4.0.09 - 16.10.2020'; my $Module_Version = '4.0.11 - 23.10.2020';
my $AttrList = join (' ', my $AttrList = join (' ',
'(reading|get|set)[0-9]+(-[0-9]+)?Name', '(reading|get|set)[0-9]+(-[0-9]+)?Name',
@ -953,7 +953,7 @@ sub DoAuth {
$steps{$1} = 1; $steps{$1} = 1;
} }
} }
Log3 $name, 4, "$name: Auth called with Steps: " . join (" ", sort keys %steps); Log3 $name, 4, "$name: DoAuth called with Steps: " . join (" ", sort keys %steps);
$hash->{sid} = '' if AttrVal($name, "clearSIdBeforeAuth", 0); $hash->{sid} = '' if AttrVal($name, "clearSIdBeforeAuth", 0);
foreach my $step (sort {$b cmp $a} keys %steps) { # reverse sort foreach my $step (sort {$b cmp $a} keys %steps) { # reverse sort
@ -1293,7 +1293,7 @@ sub GetFn {
my $request = PrepareRequest($hash, "get", $getNum); my $request = PrepareRequest($hash, "get", $getNum);
if ($request->{'url'}) { if ($request->{'url'}) {
Auth $hash if (AttrVal($name, "reAuthAlways", 0)); DoAuth $hash if (AttrVal($name, "reAuthAlways", 0));
$request->{'value'} = $getVal; $request->{'value'} = $getVal;
AddToSendQueue($hash, $request); AddToSendQueue($hash, $request);
} else { } else {
@ -1325,7 +1325,7 @@ sub GetUpdate {
} }
if ($hash->{MainURL}) { if ($hash->{MainURL}) {
Auth $hash if (AttrVal($name, 'reAuthAlways', 0)); Auth($hash) if (AttrVal($name, 'reAuthAlways', 0));
my $request = PrepareRequest($hash, 'reading'); my $request = PrepareRequest($hash, 'reading');
AddToSendQueue($hash, $request); # no need to copy the request - the hash has been created in prepare above AddToSendQueue($hash, $request); # no need to copy the request - the hash has been created in prepare above
} }
@ -1352,7 +1352,7 @@ sub GetUpdate {
Log3 $name, 3, "$name: no URL for Get $getNum"; Log3 $name, 3, "$name: no URL for Get $getNum";
next LOOP; next LOOP;
} }
Auth $hash if (AttrVal($name, "reAuthAlways", 0)); DoAuth $hash if (AttrVal($name, "reAuthAlways", 0));
AddToSendQueue($hash, $request); AddToSendQueue($hash, $request);
} }
return; return;
@ -2516,7 +2516,7 @@ sub ReadyForSending {
return; return;
} }
} }
my $minSendDelay = AttrVal($hash->{NAME}, "minSendDelay", 0.2); my $minSendDelay = AttrVal($name, "minSendDelay", 0.2);
if ($now < $last + $minSendDelay) { if ($now < $last + $minSendDelay) {
StartQueueTimer($hash, \&HTTPMOD::HandleSendQueue, {log => "minSendDelay $minSendDelay not over"}); StartQueueTimer($hash, \&HTTPMOD::HandleSendQueue, {log => "minSendDelay $minSendDelay not over"});
return; return;

2
fhem/lib/FHEM/HTTPMOD/Utils.pm
View File

@ -269,7 +269,7 @@ sub EvalExpr {
my $inCheckEval = ($checkOnly ? 0 : 1); my $inCheckEval = ($checkOnly ? 0 : 1);
my $assign = ''; my $assign = 'package main; ';
foreach my $key (keys %{$oRef}) { foreach my $key (keys %{$oRef}) {
my $type = ref $oRef->{$key}; my $type = ref $oRef->{$key};
my $vName = substr($key,1); my $vName = substr($key,1);