From 9075ce9e50fc021bbd9bc8c4a135d9b5e509434d Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Tue, 16 Oct 2012 08:24:17 +0000 Subject: [PATCH] Timeout for connect too. git-svn-id: https://svn.fhem.de/fhem/trunk@1979 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/HttpUtils.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/HttpUtils.pm b/fhem/FHEM/HttpUtils.pm index 6f4c5250c..4b266c536 100644 --- a/fhem/FHEM/HttpUtils.pm +++ b/fhem/FHEM/HttpUtils.pm @@ -45,6 +45,7 @@ urlEncode($) { ################## # - if data (which is urlEncoded) is set, then a POST is performed, else a GET. # - noshutdown must be set for e.g the Fritz!Box +# 4.0 is needed for some clients trying to reach fhem.de, 2.0 was not enough sub CustomGetFileFromURL($$@) { @@ -70,10 +71,13 @@ CustomGetFileFromURL($$@) my $conn; if($protocol eq "https") { eval "use IO::Socket::SSL"; - Log 1, $@ if($@); - $conn = IO::Socket::SSL->new(PeerAddr => "$host:$port") if(!$@); + if($@) { + Log 1, $@; + } else { + $conn = IO::Socket::SSL->new(PeerAddr=>"$host:$port", Timeout=>$timeout); + } } else { - $conn = IO::Socket::INET->new(PeerAddr => "$host:$port"); + $conn = IO::Socket::INET->new(PeerAddr=>"$host:$port", Timeout=>$timeout); } if(!$conn) { Log 1, "GetFileFromURL: Can't connect to $protocol://$host:$port\n";