Mercurial > hg > nginx-ranges
comparison src/mail/ngx_mail_handler.c @ 410:a094317ba307 NGINX_0_7_14
nginx 0.7.14
*) Change: now the ssl_certificate and ssl_certificate_key directives
have not default values.
*) Feature: the "listen" directive supports the "ssl" parameter.
*) Feature: now nginx takes into account a time zone change while
reconfiguration on FreeBSD and Linux.
*) Bugfix: the "listen" directive parameters such as "backlog",
"rcvbuf", etc. were not set, if a default server was not the first
one.
*) Bugfix: if URI part captured by a "rewrite" directive was used as a
query string, then the query string was not escaped.
*) Bugfix: configuration file validity test improvements.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 01 Sep 2008 00:00:00 +0400 |
parents | 05981f639d21 |
children | dac47e9ef0d5 |
comparison
equal
deleted
inserted
replaced
409:d46814b99ca0 | 410:a094317ba307 |
---|---|
116 ngx_mail_ssl_conf_t *sslcf; | 116 ngx_mail_ssl_conf_t *sslcf; |
117 | 117 |
118 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); | 118 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); |
119 | 119 |
120 if (sslcf->enable) { | 120 if (sslcf->enable) { |
121 c->log->action = "SSL handshaking"; | |
122 | |
121 ngx_mail_ssl_init_connection(&sslcf->ssl, c); | 123 ngx_mail_ssl_init_connection(&sslcf->ssl, c); |
122 return; | 124 return; |
123 } | 125 } |
126 | |
127 if (imia[i].ssl) { | |
128 | |
129 c->log->action = "SSL handshaking"; | |
130 | |
131 if (sslcf->ssl.ctx == NULL) { | |
132 ngx_log_error(NGX_LOG_ERR, c->log, 0, | |
133 "no \"ssl_certificate\" is defined " | |
134 "in server listening on SSL port"); | |
135 ngx_mail_close_connection(c); | |
136 return; | |
137 } | |
138 | |
139 ngx_mail_ssl_init_connection(&sslcf->ssl, c); | |
140 return; | |
141 } | |
142 | |
124 } | 143 } |
125 #endif | 144 #endif |
126 | 145 |
127 ngx_mail_init_session(c); | 146 ngx_mail_init_session(c); |
128 } | 147 } |