mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 13:42:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mail: fixed build without SSL.

Browse Source 
Broken by d84f13618277 and 12ea1de7d87c (1.19.8).

Reported by Sergey Osokin.
This commit is contained in:
Maxim Dounin 2021-03-11 04:46:26 +03:00
parent 6b06660e07
commit 3bbec30739
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mail/ngx_mail_auth_http_module.c
View File

@ -1135,10 +1135,10 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
size_t len; size_t len;
ngx_buf_t *b; ngx_buf_t *b;
ngx_str_t login, passwd; ngx_str_t login, passwd;
ngx_connection_t *c;
#if (NGX_MAIL_SSL) #if (NGX_MAIL_SSL)
ngx_str_t verify, subject, issuer, serial, fingerprint, ngx_str_t verify, subject, issuer, serial, fingerprint,
raw_cert, cert; raw_cert, cert;
ngx_connection_t *c;
ngx_mail_ssl_conf_t *sslcf; ngx_mail_ssl_conf_t *sslcf;
#endif #endif
ngx_mail_core_srv_conf_t *cscf; ngx_mail_core_srv_conf_t *cscf;
@ -1151,9 +1151,10 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
return NULL; return NULL;
} }
c = s->connection;
#if (NGX_MAIL_SSL) #if (NGX_MAIL_SSL)
c = s->connection;
sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
if (c->ssl && sslcf->verify) { if (c->ssl && sslcf->verify) {

7
src/mail/ngx_mail_handler.c
View File

@ -272,16 +272,17 @@ ngx_mail_proxy_protocol_handler(ngx_event_t *rev)
static void static void
ngx_mail_init_session_handler(ngx_event_t *rev) ngx_mail_init_session_handler(ngx_event_t *rev)
{ {
ngx_connection_t *c; ngx_connection_t *c;
ngx_mail_session_t *s;
c = rev->data; c = rev->data;
s = c->data;
#if (NGX_MAIL_SSL) #if (NGX_MAIL_SSL)
{ {
ngx_mail_session_t *s;
ngx_mail_ssl_conf_t *sslcf; ngx_mail_ssl_conf_t *sslcf;
s = c->data;
sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
if (sslcf->enable || s->ssl) { if (sslcf->enable || s->ssl) {