Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 6777:563a1ee345a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SSL: compatibility with BoringSSL. BoringSSL changed SSL_set_tlsext_host_name() to be a real function with a (const char *) argument, so it now triggers a warning due to conversion from (u_char *). Added an explicit cast to silence the warning. Prodded by Piotr Sikora, Alessandro Ghedini.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 19 Oct 2016 18:36:50 +0300
parents 93121485c39b
children 906ac20234ed
comparison
equal deleted inserted replaced
6776:1bf4f21b1b72 6777:563a1ee345a4
1694 name.data = p; 1694 name.data = p;
1695 1695
1696 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 1696 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
1697 "upstream SSL server name: \"%s\"", name.data); 1697 "upstream SSL server name: \"%s\"", name.data);
1698 1698
1699 if (SSL_set_tlsext_host_name(c->ssl->connection, name.data) == 0) { 1699 if (SSL_set_tlsext_host_name(c->ssl->connection,
1700 (char *) name.data)
1701 == 0)
1702 {
1700 ngx_ssl_error(NGX_LOG_ERR, r->connection->log, 0, 1703 ngx_ssl_error(NGX_LOG_ERR, r->connection->log, 0,
1701 "SSL_set_tlsext_host_name(\"%s\") failed", name.data); 1704 "SSL_set_tlsext_host_name(\"%s\") failed", name.data);
1702 return NGX_ERROR; 1705 return NGX_ERROR;
1703 } 1706 }
1704 1707