diff --git a/fhem/CHANGED b/fhem/CHANGED
index f2b216439..1ab0ecbd1 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,8 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- SVN
- - bugfix: ENIGMA2: set noshutdown=0 on Fritzbox devices and add attribut
- http-noshutdown for control
- feature: JSONMETER: added statistic functions
- feature: LightScene: added scene editor from UliM
- feature: SYSMON: New method: SYSMON_ShowValuesText
diff --git a/fhem/FHEM/70_ENIGMA2.pm b/fhem/FHEM/70_ENIGMA2.pm
index 7671d0fde..a5efc4e11 100644
--- a/fhem/FHEM/70_ENIGMA2.pm
+++ b/fhem/FHEM/70_ENIGMA2.pm
@@ -24,7 +24,7 @@
# along with fhem. If not, see .
#
#
-# Version: 1.3.3
+# Version: 1.3.2
#
# Major Version History:
# - 1.3.0 - 2013-12-21
@@ -78,7 +78,7 @@ sub ENIGMA2_Initialize($) {
$hash->{UndefFn} = "ENIGMA2_Undefine";
$hash->{AttrList} =
-"https:0,1 http-method:GET,POST http-noshutdown:1,0 disable:0,1 bouquet-tv bouquet-radio timeout "
+"https:0,1 http-method:GET,POST disable:0,1 bouquet-tv bouquet-radio timeout "
. $readingFnAttributes;
$data{RC_layout}{ENIGMA2_DreamMultimedia_DM500_DM800_SVG} =
@@ -769,14 +769,11 @@ sub ENIGMA2_Define($$) {
{
$attr{$name}{"http-method"} = 'POST';
}
- }
- unless ( defined( AttrVal( $name, "http-noshutdown", undef ) ) ) {
- # do shutdown in case this is a FritzBox
- if ( exists $ENV{CONFIG_PRODUKT_NAME}
- && defined $ENV{CONFIG_PRODUKT_NAME} )
- {
- $attr{$name}{"http-noshutdown"} = '0';
+ # default method is GET and should be compatible to most
+ # ENIGMA2 Webif versions
+ else {
+ $attr{$name}{"http-method"} = 'GET';
}
}
unless ( defined( AttrVal( $name, "webCmd", undef ) ) ) {
@@ -806,11 +803,10 @@ sub ENIGMA2_Define($$) {
###################################
sub ENIGMA2_SendCommand($$;$$) {
my ( $hash, $service, $cmd, $type ) = @_;
- my $name = $hash->{NAME};
- my $address = $hash->{helper}{ADDRESS};
- my $port = $hash->{helper}{PORT};
- my $http_method =
- ( $attr{$name}{"http-method"} ) ? $attr{$name}{"http-method"} : "GET";
+ my $name = $hash->{NAME};
+ my $address = $hash->{helper}{ADDRESS};
+ my $port = $hash->{helper}{PORT};
+ my $http_method = $attr{$name}{"http-method"};
my $timeout;
$cmd = ( defined($cmd) ) ? $cmd : "";
@@ -875,23 +871,20 @@ sub ENIGMA2_SendCommand($$;$$) {
$timeout = $attr{$name}{timeout};
}
else {
- $timeout = 3;
+ $timeout = 6;
}
- my $noshutdown =
- ( $attr{$name}{"http-noshutdown"} )
- ? $attr{$name}{"http-noshutdown"}
- : 1;
-
# send request via HTTP-GET method
if ( $http_method eq "GET" || $http_method eq "" || $cmd eq "" ) {
Log3 $name, 5, "ENIGMA2 $name: GET " . urlDecode($URL);
+ # $response = GetFileFromURL( $URL, $timeout, undef, 0, 5 );
+
HttpUtils_NonblockingGet(
{
url => $URL,
timeout => $timeout,
- noshutdown => $noshutdown,
+ noshutdown => 1,
data => undef,
hash => $hash,
service => $service,
@@ -911,11 +904,13 @@ sub ENIGMA2_SendCommand($$;$$) {
. " (POST DATA: "
. urlDecode($cmd) . ")";
+ # $response = GetFileFromURL( $URL, $timeout, $cmd, 0, 5 );
+
HttpUtils_NonblockingGet(
{
url => $URL,
timeout => $timeout,
- noshutdown => $noshutdown,
+ noshutdown => 1,
data => $cmd,
hash => $hash,
service => $service,
@@ -2758,9 +2753,6 @@ sub ENIGMA2_GetRemotecontrolCommand($) {
http-method - HTTP access method to be used; e.g. a FritzBox might need to use POST instead of GET (GET/POST)
-
- http-noshutdown - Explicitly shutdown HTTP connections or not; e.g. a FritzBox might this to be 0 (default=1)
-
https - Access box via secure HTTP (true/false)