From cb63cfad1c06358d6f883a84afd2213382b52231 Mon Sep 17 00:00:00 2001
From: StefanStrobel <>
Date: Fri, 23 Oct 2020 15:03:23 +0000
Subject: [PATCH] 98_HTTPMOD: bug fixes

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@23011 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/98_HTTPMOD.pm        | 12 ++++++------
 lib/FHEM/HTTPMOD/Utils.pm |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/FHEM/98_HTTPMOD.pm b/FHEM/98_HTTPMOD.pm
index 845451efc..4cc0a5cec 100755
--- a/FHEM/98_HTTPMOD.pm
+++ b/FHEM/98_HTTPMOD.pm
@@ -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 (' ', 
       '(reading|get|set)[0-9]+(-[0-9]+)?Name', 
@@ -953,7 +953,7 @@ sub DoAuth {
             $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);
     foreach my $step (sort {$b cmp $a} keys %steps) {   # reverse sort
@@ -1293,7 +1293,7 @@ sub GetFn {
 
     my $request = PrepareRequest($hash, "get", $getNum);
     if ($request->{'url'}) {
-        Auth $hash if (AttrVal($name, "reAuthAlways", 0));
+        DoAuth $hash if (AttrVal($name, "reAuthAlways", 0));
         $request->{'value'}  = $getVal;
         AddToSendQueue($hash, $request);        
     } else {
@@ -1325,7 +1325,7 @@ sub GetUpdate {
     }
     
     if ($hash->{MainURL}) {
-        Auth $hash if (AttrVal($name, 'reAuthAlways', 0));
+        Auth($hash) if (AttrVal($name, 'reAuthAlways', 0));
         my $request = PrepareRequest($hash, 'reading');
         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";
             next LOOP;
         }
-        Auth $hash if (AttrVal($name, "reAuthAlways", 0));
+        DoAuth $hash if (AttrVal($name, "reAuthAlways", 0));
         AddToSendQueue($hash, $request); 
     }
     return;
@@ -2516,7 +2516,7 @@ sub ReadyForSending {
             return;
         }
     }
-    my $minSendDelay = AttrVal($hash->{NAME}, "minSendDelay", 0.2);
+    my $minSendDelay = AttrVal($name, "minSendDelay", 0.2);
     if ($now < $last + $minSendDelay) {
         StartQueueTimer($hash, \&HTTPMOD::HandleSendQueue, {log => "minSendDelay $minSendDelay not over"});
         return;
diff --git a/lib/FHEM/HTTPMOD/Utils.pm b/lib/FHEM/HTTPMOD/Utils.pm
index df9458267..3b703d44e 100644
--- a/lib/FHEM/HTTPMOD/Utils.pm
+++ b/lib/FHEM/HTTPMOD/Utils.pm
@@ -269,7 +269,7 @@ sub EvalExpr {
 
     my $inCheckEval = ($checkOnly ? 0 : 1);
 
-    my $assign = '';
+    my $assign = 'package main; ';
     foreach my $key (keys %{$oRef}) {
         my $type  = ref $oRef->{$key};
         my $vName = substr($key,1);