diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2021-03-11 04:46:26 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2021-03-11 04:46:26 +0300 |
| commit | 3bbec30739b17783394e34924ca732b946550323 (patch) | |
| tree | e56479e2d970125e0defcc0a4b9299ce707b8abe | |
| parent | 6b06660e0740fc65a2cbae60d68c371509e0d208 (diff) | |
| download | nginx-3bbec30739b17783394e34924ca732b946550323.tar.gz nginx-3bbec30739b17783394e34924ca732b946550323.zip | |
Mail: fixed build without SSL.
Broken by d84f13618277 and 12ea1de7d87c (1.19.8).
Reported by Sergey Osokin.
| -rw-r--r-- | src/mail/ngx_mail_auth_http_module.c | 5 | ||||
| -rw-r--r-- | src/mail/ngx_mail_handler.c | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/mail/ngx_mail_auth_http_module.c b/src/mail/ngx_mail_auth_http_module.c index 06ded470a..2a198f494 100644 --- a/src/mail/ngx_mail_auth_http_module.c +++ b/src/mail/ngx_mail_auth_http_module.c @@ -1135,10 +1135,10 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool, size_t len; ngx_buf_t *b; ngx_str_t login, passwd; + ngx_connection_t *c; #if (NGX_MAIL_SSL) ngx_str_t verify, subject, issuer, serial, fingerprint, raw_cert, cert; - ngx_connection_t *c; ngx_mail_ssl_conf_t *sslcf; #endif 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; } + c = s->connection; + #if (NGX_MAIL_SSL) - c = s->connection; sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); if (c->ssl && sslcf->verify) { diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c index b9010535b..0aaa0e786 100644 --- a/src/mail/ngx_mail_handler.c +++ b/src/mail/ngx_mail_handler.c @@ -272,16 +272,17 @@ ngx_mail_proxy_protocol_handler(ngx_event_t *rev) static void ngx_mail_init_session_handler(ngx_event_t *rev) { - ngx_connection_t *c; - ngx_mail_session_t *s; + ngx_connection_t *c; c = rev->data; - s = c->data; #if (NGX_MAIL_SSL) { + ngx_mail_session_t *s; ngx_mail_ssl_conf_t *sslcf; + s = c->data; + sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); if (sslcf->enable || s->ssl) { |