diff options
| author | Stuart Cardall <developer@it-offshore.co.uk> | 2016-08-11 22:27:08 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-09-22 10:29:13 +0000 |
| commit | 5620eba1f20cbe92bc802d191d48b480515cbad7 (patch) | |
| tree | 7541f7e6a3db9229e4ffe9350ac4b766fc8418f1 /testing/nginx-naxsi/ipv6.patch | |
| parent | 8b5e2d400b49419bd37bda3c306b928baad90e1b (diff) | |
| download | aports-5620eba1f20cbe92bc802d191d48b480515cbad7.tar.bz2 aports-5620eba1f20cbe92bc802d191d48b480515cbad7.tar.xz | |
testing/nginx-naxsi: update to 1.11.3
http://nginx.org/en/CHANGES
Diffstat (limited to 'testing/nginx-naxsi/ipv6.patch')
| -rw-r--r-- | testing/nginx-naxsi/ipv6.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/testing/nginx-naxsi/ipv6.patch b/testing/nginx-naxsi/ipv6.patch index 9b05f8ff83..74762c9580 100644 --- a/testing/nginx-naxsi/ipv6.patch +++ b/testing/nginx-naxsi/ipv6.patch @@ -1,6 +1,6 @@ ---- a/src/http/ngx_http_core_module.c -+++ b/src/http/ngx_http_core_module.c -@@ -2442,7 +2442,11 @@ +--- nginx-1.11.3/src/http/ngx_http_core_module.c ++++ nginx-1.11.3/src/http/ngx_http_core_module.c.new +@@ -2948,7 +2948,11 @@ ngx_uint_t i; ngx_conf_t pcf; ngx_http_module_t *module; @@ -12,12 +12,12 @@ ngx_http_conf_ctx_t *ctx, *http_ctx; ngx_http_listen_opt_t lsopt; ngx_http_core_srv_conf_t *cscf, **cscfp; -@@ -2526,6 +2530,19 @@ +@@ -3032,6 +3036,19 @@ if (rv == NGX_CONF_OK && !cscf->listen) { ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t)); - + +#if (NGX_HAVE_INET6) -+ sin6 = &lsopt.u.sockaddr_in6; ++ sin6 = &lsopt.sockaddr.sockaddr_in6; + + sin6->sin6_family = AF_INET6; +#if (NGX_WIN32) @@ -29,14 +29,14 @@ + + lsopt.socklen = sizeof(struct sockaddr_in6); +#else - sin = &lsopt.u.sockaddr_in; - + sin = &lsopt.sockaddr.sockaddr_in; + sin->sin_family = AF_INET; -@@ -2537,6 +2554,7 @@ +@@ -3043,6 +3060,7 @@ sin->sin_addr.s_addr = INADDR_ANY; - + lsopt.socklen = sizeof(struct sockaddr_in); +#endif - + lsopt.backlog = NGX_LISTEN_BACKLOG; lsopt.rcvbuf = -1; |