Mercurial > hg > nginx-quic
annotate src/mail/ngx_mail_ssl_module.h @ 4152:65c1c241d70e
Better handling of late upstream creation.
Configuration with duplicate upstream blocks defined after first use, i.e.
like
server {
...
location / {
proxy_pass http://backend;
}
}
upstream backend { ... }
upstream backend { ... }
now correctly results in "duplicate upstream" error.
Additionally, upstream blocks defined after first use now handle various
server directive parameters ("weight", "max_fails", etc.). Previously
configuration like
server {
...
location / {
proxy_pass http://backend;
}
}
upstream backend {
server 127.0.0.1 max_fails=5;
}
incorrectly resulted in "invalid parameter "max_fails=5"" error.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 27 Sep 2011 11:18:51 +0000 |
parents | 0832a6997227 |
children | d620f497c50f |
rev | line source |
---|---|
539 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
1136 | 7 #ifndef _NGX_MAIL_SSL_H_INCLUDED_ |
8 #define _NGX_MAIL_SSL_H_INCLUDED_ | |
539 | 9 |
10 | |
11 #include <ngx_config.h> | |
12 #include <ngx_core.h> | |
1136 | 13 #include <ngx_mail.h> |
539 | 14 |
15 | |
1136 | 16 #define NGX_MAIL_STARTTLS_OFF 0 |
17 #define NGX_MAIL_STARTTLS_ON 1 | |
18 #define NGX_MAIL_STARTTLS_ONLY 2 | |
583 | 19 |
20 | |
539 | 21 typedef struct { |
976 | 22 ngx_flag_t enable; |
2224 | 23 ngx_flag_t prefer_server_ciphers; |
976 | 24 |
25 ngx_ssl_t ssl; | |
547 | 26 |
2224 | 27 ngx_uint_t starttls; |
976 | 28 ngx_uint_t protocols; |
547 | 29 |
976 | 30 ssize_t builtin_session_cache; |
547 | 31 |
976 | 32 time_t session_timeout; |
573 | 33 |
976 | 34 ngx_str_t certificate; |
35 ngx_str_t certificate_key; | |
2044 | 36 ngx_str_t dhparam; |
3960 | 37 ngx_str_t ecdh_curve; |
539 | 38 |
976 | 39 ngx_str_t ciphers; |
539 | 40 |
976 | 41 ngx_shm_zone_t *shm_zone; |
2224 | 42 |
43 u_char *file; | |
44 ngx_uint_t line; | |
1136 | 45 } ngx_mail_ssl_conf_t; |
539 | 46 |
47 | |
1136 | 48 extern ngx_module_t ngx_mail_ssl_module; |
539 | 49 |
50 | |
1136 | 51 #endif /* _NGX_MAIL_SSL_H_INCLUDED_ */ |