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.c | |
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.c')
-rw-r--r-- | src/mail/ngx_mail.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c index f17c2ccc3..890d8153a 100644 --- a/src/mail/ngx_mail.c +++ b/src/mail/ngx_mail.c @@ -405,6 +405,7 @@ ngx_mail_add_addrs(ngx_conf_t *cf, ngx_mail_port_t *mport, #if (NGX_MAIL_SSL) addrs[i].conf.ssl = addr[i].opt.ssl; #endif + addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol; addrs[i].conf.addr_text = addr[i].opt.addr_text; } @@ -439,6 +440,7 @@ ngx_mail_add_addrs6(ngx_conf_t *cf, ngx_mail_port_t *mport, #if (NGX_MAIL_SSL) addrs6[i].conf.ssl = addr[i].opt.ssl; #endif + addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol; addrs6[i].conf.addr_text = addr[i].opt.addr_text; } |