From 1b11ecda42708774ed29601914d1a0995a3df227 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Mon, 15 Mar 2021 14:00:33 +0000 Subject: [PATCH] HttpUtils.pm: fix DNS timeout handling (Forum #119497) git-svn-id: https://svn.fhem.de/fhem/trunk@23979 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/HttpUtils.pm | 5 ++--- fhem/www/pgm2/fhemweb.js | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/HttpUtils.pm b/fhem/FHEM/HttpUtils.pm index 4840e3fb3..af572ca1e 100644 --- a/fhem/FHEM/HttpUtils.pm +++ b/fhem/FHEM/HttpUtils.pm @@ -302,14 +302,13 @@ HttpUtils_gethostbyname($$$$) $dh{dnsTo} = 0.25; $dh{lSelectTs} = $selectTimestamp; - $dh{selectTimestamp} = $selectTimestamp; sub dnsQuery($) { my ($dh) = @_; - $dh->{dnsTo} *= 2 if($dh->{lSelectTs} != $dh->{selectTimestamp}); - $dh->{lSelectTs} = $dh->{selectTimestamp}; + $dh->{dnsTo} *= 2 if($dh->{lSelectTs} != $selectTimestamp); + $dh->{lSelectTs} = $selectTimestamp; return HttpUtils_Err({ hash=>$dh, msg=>"DNS"}) if($dh->{dnsTo} > $dh->{origHash}->{timeout}/2); my $ret = syswrite $dh->{conn}, $dh->{qry}; diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js index 6bee70497..32e546775 100644 --- a/fhem/www/pgm2/fhemweb.js +++ b/fhem/www/pgm2/fhemweb.js @@ -393,7 +393,6 @@ FW_getHelp(dev, fn) var lang = $("body").attr("data-language"); var url = FW_root+"/docs/commandref_frame"+ (lang == "EN" ? "" : "_"+lang)+".html"; -log(url); $.ajax({ url:url, headers: { "cache-control": "no-cache" }, success: function(data, textStatus, req){