diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2017-04-25 23:18:09 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2017-04-25 23:18:09 +0000 |
| commit | 09d995fd2c5573d663dfb8df8b6846fc441cfce5 (patch) | |
| tree | 84072d67c0ae130907d90250db176210a6b0e2d5 /www/nginx/files/extra-patch-ngx_http_memc_util.c | |
| parent | Fix USE_GITHUB usage. (diff) | |
Upgrade from 1.10.3 to 1.12.0.
ChangeLog: http://nginx.org/en/CHANGES-1.12
Remove IPV6 knob, IPv6 now compiled-in automatically if support is found.
Also, remove third-party modules:
o) udplog
o) statsd
Enable third_party mod_zip module back by changing upstream.
Upgrade third-party modules:
o) lua to 0.10.8
o) upstream_fair to b5be36f (upstream has been changed)
o) upload to 72ec037 (upstream has been changed).
o) http_auth_krb5 to 0c6ff3f.
o) party njs to 0.1.10.
Please see this comment in case of the production use of the lua module:
https://github.com/openresty/lua-nginx-module/pull/1017#issuecomment-294076002
Patches obtained from:
o) https://github.com/openresty/lua-nginx-module/commit/0459a285ca0159d45e73da8bd1164edb5c57cde3
o) https://github.com/SpiderLabs/ModSecurity/pull/1373/commits/d19df159043106a4d6dfd113696900b5b0dae24b
Diffstat (limited to 'www/nginx/files/extra-patch-ngx_http_memc_util.c')
| -rw-r--r-- | www/nginx/files/extra-patch-ngx_http_memc_util.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/www/nginx/files/extra-patch-ngx_http_memc_util.c b/www/nginx/files/extra-patch-ngx_http_memc_util.c new file mode 100644 index 000000000000..8537d72142cb --- /dev/null +++ b/www/nginx/files/extra-patch-ngx_http_memc_util.c @@ -0,0 +1,17 @@ +--- ../memc-nginx-module-0.17/src/ngx_http_memc_util.c.orig 2016-11-20 14:54:02.640140000 -0500 ++++ ../memc-nginx-module-0.17/src/ngx_http_memc_util.c 2016-11-20 14:54:34.579764000 -0500 +@@ -141,12 +141,14 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port && url->default_port + && uscfp[i]->default_port != url->default_port) + { + dd("upstream_add: default_port not match"); + continue; + } ++#endif + + return uscfp[i]; + } |
