FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6423 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2014-08-19 20:18:59 +00:00
parent 11b07184c3
commit 93cae33309
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/CHANGED
View File

@ -1,5 +1,8 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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: update rewritten, restore added
- feature: enabled JavaScript in 02_RSS to support WebViewControl - feature: enabled JavaScript in 02_RSS to support WebViewControl
- added: new module 36_WMBUS.pm (kaihs) Wireless M-Bus - added: new module 36_WMBUS.pm (kaihs) Wireless M-Bus

3
fhem/FHEM/57_Calendar.pm
View File

@ -863,7 +863,8 @@ sub Calendar_GetUpdate($$) {
my $ics; my $ics;
if($type eq "url"){ 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") { } elsif($type eq "file") {
if(open(ICSFILE, $url)) { if(open(ICSFILE, $url)) {
while(<ICSFILE>) { while(<ICSFILE>) {

12
fhem/FHEM/59_Weather.pm
View File

@ -219,8 +219,14 @@ sub Weather_RetrieveData($$)
my $url = "http://weather.yahooapis.com/forecastrss?w=" . $location . "&u=" . $units; my $url = "http://weather.yahooapis.com/forecastrss?w=" . $location . "&u=" . $units;
if ($blocking) { 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); my %param = (hash => $hash, doTrigger => 0);
Weather_RetrieveDataFinished(\%param, undef, $response); Weather_RetrieveDataFinished(\%param, undef, $response);
} }
@ -229,7 +235,7 @@ sub Weather_RetrieveData($$)
{ {
url => $url, url => $url,
timeout => 5, timeout => 5,
noshutdown => 0, #noshutdown => 0,
hash => $hash, hash => $hash,
doTrigger => 1, doTrigger => 1,
callback => \&Weather_RetrieveDataFinished, callback => \&Weather_RetrieveDataFinished,