diff --git a/fhem/CHANGED b/fhem/CHANGED index 6641e80c5..02ac02dad 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,8 @@ # 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. + - change: removed noshutdown=0 for HTTP connections made in 57_Calendar.pm + and 59_Weather.pm to address issues when FHEM is behind + a web proxy - feature: update rewritten, restore added - feature: enabled JavaScript in 02_RSS to support WebViewControl - added: new module 36_WMBUS.pm (kaihs) Wireless M-Bus diff --git a/fhem/FHEM/57_Calendar.pm b/fhem/FHEM/57_Calendar.pm index a423f25b2..259a036d0 100644 --- a/fhem/FHEM/57_Calendar.pm +++ b/fhem/FHEM/57_Calendar.pm @@ -863,7 +863,8 @@ sub Calendar_GetUpdate($$) { my $ics; if($type eq "url"){ - $ics= GetFileFromURLQuiet($url,10,undef,0,5) if($type eq "url"); + #$ics= GetFileFromURLQuiet($url,10,undef,0,5) if($type eq "url"); + $ics= HttpUtils_BlockingGet( { url => $url, hideurl => 1, timeout => 10, } ); } elsif($type eq "file") { if(open(ICSFILE, $url)) { while() { diff --git a/fhem/FHEM/59_Weather.pm b/fhem/FHEM/59_Weather.pm index 1582b6a10..9002eea25 100755 --- a/fhem/FHEM/59_Weather.pm +++ b/fhem/FHEM/59_Weather.pm @@ -219,8 +219,14 @@ sub Weather_RetrieveData($$) my $url = "http://weather.yahooapis.com/forecastrss?w=" . $location . "&u=" . $units; if ($blocking) { - my $response = GetFileFromURL($url, 5, undef, 0); - + #my $response = GetFileFromURL($url, 5, undef, 0); + my $response = HttpUtils_BlockingGet( + { + url => $url, + timeout => 5, + #noshutdown => 0, + } + ); my %param = (hash => $hash, doTrigger => 0); Weather_RetrieveDataFinished(\%param, undef, $response); } @@ -229,7 +235,7 @@ sub Weather_RetrieveData($$) { url => $url, timeout => 5, - noshutdown => 0, + #noshutdown => 0, hash => $hash, doTrigger => 1, callback => \&Weather_RetrieveDataFinished,