From 5bf20dccbc7f81f3d7198c606de6c4b93552b56b Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Wed, 19 Nov 2014 23:07:39 +0000
Subject: [PATCH] 01_FHEMWEB.pm: be more consequent for closeConn

git-svn-id: https://svn.fhem.de/fhem/trunk@7024 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/01_FHEMWEB.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 67e5219fa..2da32a0a1 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -421,7 +421,7 @@ FW_closeConn($)
 {
   my ($hash) = @_;
   if(AttrVal($hash->{SNAME}, "closeConn",               # Forum #20294
-                              $FW_userAgent =~ m/(iPhone|iPad|iPod)/)) {
+                              $FW_userAgent =~ m/(iPhone|iPad|iPod|Darwin)/)) {
     TcpServer_Close($hash);
     delete($defs{$hash->{NAME}});
   }
@@ -507,8 +507,8 @@ FW_answerCall($)
     print $c "HTTP/1.1 302 Found\r\n",
              "Content-Length: 0\r\n", $FW_headercors,
              "Location: $FW_ME\r\n\r\n";
+    FW_closeConn($FW_chash);
     return -1;
-
   }
 
 
@@ -1465,6 +1465,7 @@ FW_returnFileAsStream($$$$$)
     if(defined($etag) && defined($if_none_match) && $etag eq $if_none_match) {
       FW_myPrint($c,"HTTP/1.1 304 Not Modified\r\n".
                     $FW_headercors . "\r\n");
+      FW_closeConn($FW_chash);
       return -1;
     }
   }
@@ -1472,6 +1473,7 @@ FW_returnFileAsStream($$$$$)
   if(!open(FH, $path)) {
     Log3 $FW_wname, 2, "FHEMWEB $FW_wname $path: $!";
     FW_pO "<div id=\"content\">$path: $!</div>";
+    FW_closeConn($FW_chash);
     return 0;
   }
   binmode(FH) if($type !~ m/text/); # necessary for Windows
@@ -1503,6 +1505,7 @@ FW_returnFileAsStream($$$$$)
     FW_myPrint($c,sprintf("%x\r\n",length($buf)).$buf."\r\n") if($buf);
   }
   FW_myPrint($c, "0\r\n\r\n");
+  FW_closeConn($FW_chash);
   return -1;
 }