Mercurial > hg > nginx-ranges
comparison src/mail/ngx_mail_core_module.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 | 6ebbca3d5ed7 |
| children | 76a79816b771 |
comparison
equal
deleted
inserted
replaced
| 409:d46814b99ca0 | 410:a094317ba307 |
|---|---|
| 349 break; | 349 break; |
| 350 } | 350 } |
| 351 } | 351 } |
| 352 } | 352 } |
| 353 | 353 |
| 354 if (cf->args->nelts == 2) { | 354 for (i = 2; i < cf->args->nelts; i++) { |
| 355 return NGX_CONF_OK; | 355 |
| 356 } | 356 if (ngx_strcmp(value[i].data, "bind") == 0) { |
| 357 | 357 imls->bind = 1; |
| 358 if (ngx_strcmp(value[2].data, "bind") == 0) { | 358 continue; |
| 359 imls->bind = 1; | 359 } |
| 360 return NGX_CONF_OK; | 360 |
| 361 } | 361 if (ngx_strcmp(value[i].data, "ssl") == 0) { |
| 362 | 362 #if (NGX_MAIL_SSL) |
| 363 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 363 imls->ssl = 1; |
| 364 "the invalid \"%V\" parameter", &value[2]); | 364 continue; |
| 365 return NGX_CONF_ERROR; | 365 #else |
| 366 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 367 "the \"ssl\" parameter requires " | |
| 368 "ngx_mail_ssl_module"); | |
| 369 return NGX_CONF_ERROR; | |
| 370 #endif | |
| 371 } | |
| 372 | |
| 373 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 374 "the invalid \"%V\" parameter", &value[i]); | |
| 375 return NGX_CONF_ERROR; | |
| 376 } | |
| 377 | |
| 378 return NGX_CONF_OK; | |
| 366 } | 379 } |
| 367 | 380 |
| 368 | 381 |
| 369 static char * | 382 static char * |
| 370 ngx_mail_core_protocol(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | 383 ngx_mail_core_protocol(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |