From cbbba78f0921ceb6c2f5c7d4cd2b32b9a87350f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Wed, 9 Dec 2015 23:15:05 +0100 Subject: [PATCH] 2015-12-09 23:15 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/hbssl/ssl_sock.c + recognize "ssl" item in hash array socket filter as alternative to "ctx" and "key" --- ChangeLog.txt | 5 +++++ contrib/hbssl/ssl_sock.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 8e7ecdb959..a686d7075f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,11 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2015-12-09 23:15 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/hbssl/ssl_sock.c + + recognize "ssl" item in hash array socket filter as alternative to + "ctx" and "key" + 2015-12-09 14:22 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * include/dbinfo.ch * include/hbrdddbf.h diff --git a/contrib/hbssl/ssl_sock.c b/contrib/hbssl/ssl_sock.c index 638e16b11f..759161085a 100644 --- a/contrib/hbssl/ssl_sock.c +++ b/contrib/hbssl/ssl_sock.c @@ -361,6 +361,8 @@ static PHB_SOCKEX s_sockexNew( HB_SOCKET sd, PHB_ITEM pParams ) { PHB_ITEM pItem; + if( ssl == NULL && ( pItem = hb_hashGetCItemPtr( pParams, "ssl" ) ) != NULL ) + ssl = hb_SSL_itemGet( pItem ); if( ssl == NULL && ( pItem = hb_hashGetCItemPtr( pParams, "ctx" ) ) != NULL ) ssl = hb_SSL_itemGet( pItem ); if( ssl == NULL && ( pItem = hb_hashGetCItemPtr( pParams, "key" ) ) != NULL )