mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FHEMWEB: simplify FLOORPLAN handling

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@7580 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2015-01-15 18:36:07 +00:00
parent 6aa9732bfd
commit d62ec19e8d
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/FHEM/01_FHEMWEB.pm
View File

@@ -1513,8 +1513,6 @@ FW_returnFileAsStream($$$$$)
} }
if(!open(FH, $path)) { if(!open(FH, $path)) {
my $npath = FW_fileNameToPath($1) if($path =~ m,([^/]*)$,);
if(!open(FH, $npath)) { # Old style fake path
Log3 $FW_wname, 4, "FHEMWEB $FW_wname $path: $!"; Log3 $FW_wname, 4, "FHEMWEB $FW_wname $path: $!";
TcpServer_WriteBlocking($FW_chash, TcpServer_WriteBlocking($FW_chash,
"HTTP/1.1 404 Not Found\r\n". "HTTP/1.1 404 Not Found\r\n".
@@ -1522,7 +1520,6 @@ FW_returnFileAsStream($$$$$)
FW_closeConn($FW_chash); FW_closeConn($FW_chash);
return 0; return 0;
} }
}
binmode(FH) if($type !~ m/text/); # necessary for Windows binmode(FH) if($type !~ m/text/); # necessary for Windows
$etag = defined($etag) ? "ETag: \"$etag\"\r\n" : ""; $etag = defined($etag) ? "ETag: \"$etag\"\r\n" : "";