Mercurial > hg > nginx

comparison src/mail/ngx_mail_auth_http_module.c @ 7801:777373b5a169

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mail: fixed build without SSL. Broken by d84f13618277 and 12ea1de7d87c (1.19.8). Reported by Sergey Osokin.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Mar 2021 04:46:26 +0300
parents 12ea1de7d87c
children 13d0c1d26d47
comparison
equal deleted inserted replaced
7800:43d9c9c2981f 7801:777373b5a169
1133 ngx_mail_auth_http_conf_t *ahcf) 1133 ngx_mail_auth_http_conf_t *ahcf)
1134 { 1134 {
1135 size_t len; 1135 size_t len;
1136 ngx_buf_t *b; 1136 ngx_buf_t *b;
1137 ngx_str_t login, passwd; 1137 ngx_str_t login, passwd;
1138 ngx_connection_t *c;
1138 #if (NGX_MAIL_SSL) 1139 #if (NGX_MAIL_SSL)
1139 ngx_str_t verify, subject, issuer, serial, fingerprint, 1140 ngx_str_t verify, subject, issuer, serial, fingerprint,
1140 raw_cert, cert; 1141 raw_cert, cert;
1141 ngx_connection_t *c;
1142 ngx_mail_ssl_conf_t *sslcf; 1142 ngx_mail_ssl_conf_t *sslcf;
1143 #endif 1143 #endif
1144 ngx_mail_core_srv_conf_t *cscf; 1144 ngx_mail_core_srv_conf_t *cscf;
1145 1145
1146 if (ngx_mail_auth_http_escape(pool, &s->login, &login) != NGX_OK) { 1146 if (ngx_mail_auth_http_escape(pool, &s->login, &login) != NGX_OK) {
1149 1149
1150 if (ngx_mail_auth_http_escape(pool, &s->passwd, &passwd) != NGX_OK) { 1150 if (ngx_mail_auth_http_escape(pool, &s->passwd, &passwd) != NGX_OK) {
1151 return NULL; 1151 return NULL;
1152 } 1152 }
1153 1153
1154 c = s->connection;
1155
1154 #if (NGX_MAIL_SSL) 1156 #if (NGX_MAIL_SSL)
1155 1157
1156 c = s->connection;
1157 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); 1158 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
1158 1159
1159 if (c->ssl && sslcf->verify) { 1160 if (c->ssl && sslcf->verify) {
1160 1161
1161 /* certificate details */ 1162 /* certificate details */