Skipped 1 existing revision(s) on branch 'master'.
commit 940cb3255139e97c0dec98416fa98962901f9a3e
Merge: 37feedd 17babc1
Author: Oswald Buddenhagen <o...@users.sf.net>
Date: Sat Sep 8 18:48:05 2018 +0200
Merge branch '1.3'
src/socket.c | 2 ++
1 file changed, 2 insertions(+)
===== Full diff against 1st parent =====
diff --git a/src/socket.c b/src/socket.c
index dd79619..e3fda42 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -271,6 +271,8 @@ socket_start_tls( conn_t *conn, void (*cb)( int ok, void
*aux ) )
init_wakeup( &conn->ssl_fake, ssl_fake_cb, conn );
conn->ssl = SSL_new( ((server_conf_t *)conn->conf)->SSLContext );
+ if (ssl_return( "set server name", conn, SSL_set_tlsext_host_name(
conn->ssl, conn->conf->host ) ) < 0)
+ return;
SSL_set_fd( conn->ssl, conn->fd );
SSL_set_mode( conn->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER );
socket_expect_read( conn, 1 );
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel
