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_sticky_misc.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_sticky_misc.c')
| -rw-r--r-- | www/nginx/files/extra-patch-ngx_http_sticky_misc.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/www/nginx/files/extra-patch-ngx_http_sticky_misc.c b/www/nginx/files/extra-patch-ngx_http_sticky_misc.c new file mode 100644 index 000000000000..098cc78cdf61 --- /dev/null +++ b/www/nginx/files/extra-patch-ngx_http_sticky_misc.c @@ -0,0 +1,17 @@ +--- ../nginx-goodies-nginx-sticky-module-ng-08a395c66e42/ngx_http_sticky_misc.c.orig 2016-07-10 11:39:07.943834000 -0400 ++++ ../nginx-goodies-nginx-sticky-module-ng-08a395c66e42/ngx_http_sticky_misc.c 2016-07-10 11:43:05.601078000 -0400 +@@ -12,6 +12,14 @@ + + #include "ngx_http_sticky_misc.h" + ++#ifndef MD5_DIGEST_LENGTH ++ #define MD5_DIGEST_LENGTH 16 ++#endif ++#ifndef MD5_CBLOCK ++ #define MD5_CBLOCK 64 ++#endif ++ ++ + #ifndef ngx_str_set + #define ngx_str_set(str, text) (str)->len = sizeof(text) - 1; (str)->data = (u_char *) text + #endif |