comparison src/mail/ngx_mail.h @ 6737:a9a50bb65120

Modules compatibility: removed dependencies on NGX_MAIL_SSL. External structures are now identical regardless of mail SSL module compiled in or not.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 10 Oct 2016 18:44:17 +0300
parents cebf5fed00bf
children bcb107bb89cd
comparison
equal deleted inserted replaced
6736:f41c2530dd17 6737:a9a50bb65120
33 /* server ctx */ 33 /* server ctx */
34 ngx_mail_conf_ctx_t *ctx; 34 ngx_mail_conf_ctx_t *ctx;
35 35
36 unsigned bind:1; 36 unsigned bind:1;
37 unsigned wildcard:1; 37 unsigned wildcard:1;
38 #if (NGX_MAIL_SSL)
39 unsigned ssl:1; 38 unsigned ssl:1;
40 #endif
41 #if (NGX_HAVE_INET6) 39 #if (NGX_HAVE_INET6)
42 unsigned ipv6only:1; 40 unsigned ipv6only:1;
43 #endif 41 #endif
44 unsigned so_keepalive:2; 42 unsigned so_keepalive:2;
45 #if (NGX_HAVE_KEEPALIVE_TUNABLE) 43 #if (NGX_HAVE_KEEPALIVE_TUNABLE)
52 50
53 51
54 typedef struct { 52 typedef struct {
55 ngx_mail_conf_ctx_t *ctx; 53 ngx_mail_conf_ctx_t *ctx;
56 ngx_str_t addr_text; 54 ngx_str_t addr_text;
57 #if (NGX_MAIL_SSL)
58 ngx_uint_t ssl; /* unsigned ssl:1; */ 55 ngx_uint_t ssl; /* unsigned ssl:1; */
59 #endif
60 } ngx_mail_addr_conf_t; 56 } ngx_mail_addr_conf_t;
61 57
62 typedef struct { 58 typedef struct {
63 in_addr_t addr; 59 in_addr_t addr;
64 ngx_mail_addr_conf_t conf; 60 ngx_mail_addr_conf_t conf;