FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 07:56:03 +00:00
Code Issues Releases Wiki Activity

98_HTTPMOD: little bug fixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20841 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
StefanStrobel 2019-12-28 12:19:51 +00:00
parent 9492eb0d06
commit 2c0a0c0df7
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/98_HTTPMOD.pm
View File

@ -171,12 +171,13 @@
# 2019-11-19 little bug fixes # 2019-11-19 little bug fixes
# 2019-11-20 precompilation of preProcessRegex removed - can't compile a regex inluding a replacement part for s// # 2019-11-20 precompilation of preProcessRegex removed - can't compile a regex inluding a replacement part for s//
# 2019-11-29 new fix for special compiled regexes with regex options # 2019-11-29 new fix for special compiled regexes with regex options
# 2019-12-27 delete hash-{method} if not explicitely set
# #
# #
# #
# Todo: # Todo:
# # setXYHintExpression zum dynamischen Ändern / Erweitern der Hints
# extractAllReadings mit Filter / Prefix # extractAllReadings mit Filter / Prefix
# get after set um readings zu aktualisieren # get after set um readings zu aktualisieren
# definierbarer prefix oder Suffix für Readingsnamen wenn sie von unterschiedlichen gets über readingXY erzeugt werden # definierbarer prefix oder Suffix für Readingsnamen wenn sie von unterschiedlichen gets über readingXY erzeugt werden
@ -242,7 +243,7 @@ sub HTTPMOD_AddToQueue($$$$$;$$$$$);
sub HTTPMOD_JsonFlatter($$;$); sub HTTPMOD_JsonFlatter($$;$);
sub HTTPMOD_ExtractReading($$$$$); sub HTTPMOD_ExtractReading($$$$$);
my $HTTPMOD_Version = '3.5.19 - 29.11.2019'; my $HTTPMOD_Version = '3.5.21 - 27.12.2019';
# #
# FHEM module intitialisation # FHEM module intitialisation
@ -2675,7 +2676,10 @@ sub HTTPMOD_CheckRedirects($$)
return; return;
} else { } else {
my $ra; my $ra;
map { $ra=$1 if($_ =~ m/Location:\s*(\S+)$/) } @header; map { $ra=$1 if($_ =~ m/[Ll]ocation:\s*(\S+)$/) } @header;
if (!$ra) {
Log3 $name, 3, "$name: Error: got Redirect but no Location-Header from server";
}
$ra = "/$ra" if($ra !~ m/^http/ && $ra !~ m/^\//); $ra = "/$ra" if($ra !~ m/^http/ && $ra !~ m/^\//);
my $rurl = ($ra =~ m/^http/) ? $ra: $hash->{addr}.$ra; my $rurl = ($ra =~ m/^http/) ? $ra: $hash->{addr}.$ra;
if ($request->{ignoreredirects}) { if ($request->{ignoreredirects}) {
@ -3017,6 +3021,8 @@ sub HTTPMOD_HandleSendQueue($)
if($hash->{REQUEST}{method}) { # check if optional parameter for HTTP Method is set if($hash->{REQUEST}{method}) { # check if optional parameter for HTTP Method is set
$hash->{method} = $hash->{REQUEST}{method}; $hash->{method} = $hash->{REQUEST}{method};
Log3 $name, 5, "$name: HandleSendQueue - call with HTTP METHOD: $hash->{method} "; Log3 $name, 5, "$name: HandleSendQueue - call with HTTP METHOD: $hash->{method} ";
} else {
delete $hash->{method}; # make sure this is not set from a prior request
} }
my $fDefault = ($featurelevel > 5.9 ? 1 : 0); my $fDefault = ($featurelevel > 5.9 ? 1 : 0);
if (AttrVal($name, "handleRedirects", $fDefault)) { if (AttrVal($name, "handleRedirects", $fDefault)) {