FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 20:06:18 +00:00
Code Issues Releases Wiki Activity

Missing Zlib with multiple WEB instances crashes fhem

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@981 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-08-14 10:06:18 +00:00
parent e36dec11a4
commit 3e135400fa
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/webfrontend/pgm2/01_FHEMWEB.pm
View File

@ -41,6 +41,7 @@ use vars qw($FW_ss); # is smallscreen, needed by 97_GROUP/95_VIEW
use vars qw($FW_tp); # is touchpad (iPad / etc) use vars qw($FW_tp); # is touchpad (iPad / etc)
use vars qw(%FW_types);# device types, for sorting, for 97_GROUP/95_VIEW use vars qw(%FW_types);# device types, for sorting, for 97_GROUP/95_VIEW
my $zlib_loaded; my $zlib_loaded;
my $try_zlib = 1;
######################### #########################
@ -208,10 +209,11 @@ FW_Read($)
my $ll = GetLogLevel($FW_wname,4); my $ll = GetLogLevel($FW_wname,4);
my $c = $hash->{CD}; my $c = $hash->{CD};
if(!$zlib_loaded && AttrVal($FW_wname, "fwcompress", 1)) { if(!$zlib_loaded && $try_zlib && AttrVal($FW_wname, "fwcompress", 1)) {
$zlib_loaded = 1; $zlib_loaded = 1;
eval { require Compress::Zlib; }; eval { require Compress::Zlib; };
if($@) { if($@) {
$try_zlib = 0;
Log 1, $@; Log 1, $@;
Log 1, "$FW_wname: Can't load Compress::Zlib, deactivating compression"; Log 1, "$FW_wname: Can't load Compress::Zlib, deactivating compression";
$attr{$FW_wname}{fwcompress} = 0; $attr{$FW_wname}{fwcompress} = 0;
@ -280,8 +282,8 @@ FW_Read($)
$FW_RETTYPE=~m/svg/i || $FW_RETTYPE=~m/svg/i ||
$FW_RETTYPE=~m/script/i) && $FW_RETTYPE=~m/script/i) &&
(int(@enc) == 1 && $enc[0] =~ m/gzip/) && (int(@enc) == 1 && $enc[0] =~ m/gzip/) &&
$try_zlib &&
AttrVal($FW_wname, "fwcompress", 1)) { AttrVal($FW_wname, "fwcompress", 1)) {
$FW_RET = Compress::Zlib::memGzip($FW_RET); $FW_RET = Compress::Zlib::memGzip($FW_RET);
$compressed = "Content-Encoding: gzip\r\n"; $compressed = "Content-Encoding: gzip\r\n";
} }