X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ustream-ssl.c;h=dd0faf9f7ce3a25f8abf5aef644af334c7247cbf;hb=6ba14990e63fc956e8aff3b0b09be1fd3aaa6d75;hp=b6b74017e90f4e480a68c6e787dad27cae714609;hpb=fc0b5ec804ee43c532978dd04ab0509c34baefb0;p=project%2Fustream-ssl.git

diff --git a/ustream-ssl.c b/ustream-ssl.c
index b6b7401..dd0faf9 100644
--- a/ustream-ssl.c
+++ b/ustream-ssl.c
@@ -153,7 +153,7 @@ static bool ustream_ssl_poll(struct ustream *s)
 	bool fd_poll;
 
 	fd_poll = ustream_poll(us->conn);
-	return __ustream_ssl_poll(s) || fd_poll;
+	return __ustream_ssl_poll(us->conn) || fd_poll;
 }
 
 static void ustream_ssl_stream_init(struct ustream_ssl *us)
@@ -186,6 +186,10 @@ static int _ustream_ssl_init(struct ustream_ssl *us, struct ustream *conn, struc
 	conn->next = &us->stream;
 	ustream_set_io(ctx, us->ssl, conn);
 	ustream_ssl_stream_init(us);
+
+	if (us->server_name)
+		__ustream_ssl_set_server_name(us);
+
 	ustream_ssl_check_conn(us);
 
 	return 0;