Update from 1.19.7 to 1.19.8.
Add the vendor's patch to build mail module without SSL support. <Changelog> *) Feature: flags in the "proxy_cookie_flags" directive can now contain variables. *) Feature: the "proxy_protocol" parameter of the "listen" directive, the "proxy_protocol" and "set_real_ip_from" directives in mail proxy. *) Bugfix: HTTP/2 connections were immediately closed when using "keepalive_timeout 0"; the bug had appeared in 1.19.7. *) Bugfix: some errors were logged as unknown if nginx was built with glibc 2.32. *) Bugfix: in the eventport method. </Changelog>
This commit is contained in:
parent
142e3acd87
commit
b00391427c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=567947
3 changed files with 30 additions and 5 deletions
|
@ -2,8 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME?= nginx
|
||||
PORTVERSION= 1.19.7
|
||||
PORTREVISION= 3
|
||||
PORTVERSION= 1.19.8
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= https://nginx.org/download/ \
|
||||
LOCAL/osa
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
TIMESTAMP = 1615297765
|
||||
SHA256 (nginx-1.19.7.tar.gz) = 7ae4dd020c41d3a5e1e6a8578fcc60e508e3e27e7668e845ddc87a05a775b50e
|
||||
SIZE (nginx-1.19.7.tar.gz) = 1056631
|
||||
TIMESTAMP = 1615304472
|
||||
SHA256 (nginx-1.19.8.tar.gz) = 308919b1a1359315a8066578472f998f14cb32af8de605a3743acca834348b05
|
||||
SIZE (nginx-1.19.8.tar.gz) = 1060155
|
||||
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
|
||||
SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
|
||||
SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
--- src/mail/ngx_mail_auth_http_module.c.orig 2021-03-09 12:50:37.389186000 -0500
|
||||
+++ src/mail/ngx_mail_auth_http_module.c 2021-03-09 12:55:40.877872000 -0500
|
||||
@@ -1135,10 +1135,10 @@
|
||||
size_t len;
|
||||
ngx_buf_t *b;
|
||||
ngx_str_t login, passwd;
|
||||
+ ngx_connection_t *c;
|
||||
#if (NGX_MAIL_SSL)
|
||||
ngx_str_t verify, subject, issuer, serial, fingerprint,
|
||||
raw_cert, cert;
|
||||
- ngx_connection_t *c;
|
||||
ngx_mail_ssl_conf_t *sslcf;
|
||||
#endif
|
||||
ngx_mail_core_srv_conf_t *cscf;
|
||||
@@ -1151,9 +1151,10 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+ c = s->connection;
|
||||
+
|
||||
#if (NGX_MAIL_SSL)
|
||||
|
||||
- c = s->connection;
|
||||
sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
|
||||
|
||||
if (c->ssl && sslcf->verify) {
|
Loading…
Reference in a new issue