diff options
author | Sergey Kandaurov <pluknet@nginx.com> | 2021-03-10 15:39:01 +0300 |
---|---|---|
committer | Sergey Kandaurov <pluknet@nginx.com> | 2021-03-10 15:39:01 +0300 |
commit | 02b52e4c0b71b960ce426ef80fefa359e5e6b42e (patch) | |
tree | eb36f3f05641ada335fc88ff4f04d6e75555010c /src/mail/ngx_mail.h | |
parent | b7433b15fcdd97cc0d8b45407a4af1520663e54f (diff) | |
parent | 0026dded46da04b6b4522c5887bed5fceb4eda11 (diff) | |
download | nginx-02b52e4c0b71b960ce426ef80fefa359e5e6b42e.tar.gz nginx-02b52e4c0b71b960ce426ef80fefa359e5e6b42e.zip |
Merged with the default branch.
Diffstat (limited to 'src/mail/ngx_mail.h')
-rw-r--r-- | src/mail/ngx_mail.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h index 25ac432b0..b865a3b9e 100644 --- a/src/mail/ngx_mail.h +++ b/src/mail/ngx_mail.h @@ -41,6 +41,7 @@ typedef struct { unsigned ipv6only:1; #endif unsigned so_keepalive:2; + unsigned proxy_protocol:1; #if (NGX_HAVE_KEEPALIVE_TUNABLE) int tcp_keepidle; int tcp_keepintvl; @@ -55,7 +56,8 @@ typedef struct { typedef struct { ngx_mail_conf_ctx_t *ctx; ngx_str_t addr_text; - ngx_uint_t ssl; /* unsigned ssl:1; */ + unsigned ssl:1; + unsigned proxy_protocol:1; } ngx_mail_addr_conf_t; typedef struct { @@ -176,6 +178,7 @@ typedef enum { typedef struct { ngx_peer_connection_t upstream; ngx_buf_t *buffer; + ngx_uint_t proxy_protocol; /* unsigned proxy_protocol:1; */ } ngx_mail_proxy_ctx_t; @@ -197,6 +200,7 @@ typedef struct { ngx_uint_t mail_state; + unsigned ssl:1; unsigned protocol:3; unsigned blocked:1; unsigned quit:1; @@ -405,6 +409,7 @@ char *ngx_mail_capabilities(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); /* STUB */ void ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_addr_t *peer); void ngx_mail_auth_http_init(ngx_mail_session_t *s); +ngx_int_t ngx_mail_realip_handler(ngx_mail_session_t *s); /**/ |