From 24a3e2c095f8f6f8577cb149cec1e361f1bd4ed5 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Thu, 7 Jul 2016 14:09:30 +0000 Subject: [PATCH] HttpUtils.pm: fix SSL for noConn2 connects (FHEM2FHEM, DevIo.pm) (Forum #55194) git-svn-id: https://svn.fhem.de/fhem/trunk@11758 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/HttpUtils.pm | 7 +++++-- fhem/FHEM/TcpServerUtils.pm | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/HttpUtils.pm b/fhem/FHEM/HttpUtils.pm index 2a5d69f0a..09c4946a2 100644 --- a/fhem/FHEM/HttpUtils.pm +++ b/fhem/FHEM/HttpUtils.pm @@ -257,8 +257,6 @@ HttpUtils_Connect($) return $hash->{callback}($hash, "$host: ".strerror($errno), "") if($errno); - return $hash->{callback}($hash,undef,undef) if($hash->{noConn2}); - my $err = HttpUtils_Connect2($hash); $hash->{callback}($hash, $err, "") if($err); return $err; @@ -331,6 +329,11 @@ HttpUtils_Connect2($) return "$hash->{displayurl}: Can't connect(2) to $hash->{addr}: $err"; } + if($hash->{noConn2}) { + $hash->{callback}($hash); + return undef; + } + my $data; if(defined($hash->{data})) { if( ref($hash->{data}) eq 'HASH' ) { diff --git a/fhem/FHEM/TcpServerUtils.pm b/fhem/FHEM/TcpServerUtils.pm index c2438bce6..de065ed91 100644 --- a/fhem/FHEM/TcpServerUtils.pm +++ b/fhem/FHEM/TcpServerUtils.pm @@ -5,6 +5,7 @@ package main; use strict; use warnings; use IO::Socket; +use vars qw($SSL_ERROR); sub TcpServer_Open($$$) @@ -102,7 +103,8 @@ TcpServer_Accept($$) if( !$ret && $err != EWOULDBLOCK && $err ne "Socket is not connected") { - + $err = "" if(!$err); + $err .= " ".($SSL_ERROR ? $SSL_ERROR : IO::Socket::SSL::errstr()); Log3 $name, 1, "$type SSL/HTTPS error: $err"; close($clientinfo[0]); return undef;