From f7bb97c3d9f7f2dfc776e5c241f61fbe0a2a2787 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Sat, 19 Apr 2014 16:51:44 +0000
Subject: [PATCH] update: do not write controlfile on error HttpUtils: default
 noshutdown is changed  1 (due to squid) / shutdown option added

git-svn-id: https://svn.fhem.de/fhem/trunk@5569 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/98_update.pm | 1 +
 fhem/FHEM/HttpUtils.pm | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fhem/FHEM/98_update.pm b/fhem/FHEM/98_update.pm
index fdabb1e29..fadb59b3b 100644
--- a/fhem/FHEM/98_update.pm
+++ b/fhem/FHEM/98_update.pm
@@ -451,6 +451,7 @@ update_DoUpdate(@)
   my $getUpdates;
   ($fail,$getUpdates) = update_GetRemoteFiles($BRANCH,$url,$updateFiles_ref,$cl);
   $ret .= $getUpdates if($getUpdates);
+  return $ret if($fail);
 
   foreach my $pack (@packages) {
     # write local controlfile
diff --git a/fhem/FHEM/HttpUtils.pm b/fhem/FHEM/HttpUtils.pm
index 7b2e7a213..31c0eda6c 100644
--- a/fhem/FHEM/HttpUtils.pm
+++ b/fhem/FHEM/HttpUtils.pm
@@ -200,7 +200,8 @@ HttpUtils_Connect2($)
   $hdr .= "\r\n";
   syswrite $hash->{conn}, $hdr;
   syswrite $hash->{conn}, $data if(defined($data));
-  shutdown $hash->{conn}, 1 if(!$hash->{noshutdown} && $hash->{protocol} ne "https");
+  shutdown $hash->{conn}, 1 if($hash->{shutdown} ||
+                               (defined($hash->{noshutdown}) && $hash->{noshutdown} == 0));
 
   if($hash->{callback}) { # Nonblocking read
     $hash->{FD} = $hash->{conn}->fileno();
@@ -299,7 +300,8 @@ HttpUtils_ParseAnswer($$)
 #  mandatory:
 #    url, callback
 #  optional(default):
-#    hideurl(0),timeout(4),data(""),noshutdown(0),loglevel(4),header(""),
+#    hideurl(0),timeout(4),data(""),loglevel(4),header(""),
+#    noshutdown(1),shutdown(0),
 #    method($data ? "POST" : "GET")
 # Example:
 #   HttpUtils_NonblockingGet({