diff options
author | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2016-06-20 11:00:12 +0200 |
---|---|---|
committer | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2016-06-20 11:00:12 +0200 |
commit | bc022ce71ee743181cca4284c54247710fcee5d6 (patch) | |
tree | b7fa326607b65a9da156184af862b8ad5643a1d2 /main/nginx-lua/ipv6.patch | |
parent | 881e85da9456314a69022c9eb68e6004f9e6da62 (diff) | |
download | aports-bc022ce71ee743181cca4284c54247710fcee5d6.tar.bz2 aports-bc022ce71ee743181cca4284c54247710fcee5d6.tar.xz |
main/nginx-lua: remove, merged with main/nginx
Diffstat (limited to 'main/nginx-lua/ipv6.patch')
-rw-r--r-- | main/nginx-lua/ipv6.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/main/nginx-lua/ipv6.patch b/main/nginx-lua/ipv6.patch deleted file mode 100644 index 9b05f8ff83..0000000000 --- a/main/nginx-lua/ipv6.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/src/http/ngx_http_core_module.c -+++ b/src/http/ngx_http_core_module.c -@@ -2442,7 +2442,11 @@ - ngx_uint_t i; - ngx_conf_t pcf; - ngx_http_module_t *module; -+#if (NGX_HAVE_INET6) -+ struct sockaddr_in6 *sin6; -+#else - struct sockaddr_in *sin; -+#endif - 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 @@ - 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->sin6_family = AF_INET6; -+#if (NGX_WIN32) -+ sin6->sin6_port = htons(80); -+#else -+ sin6->sin6_port = htons((getuid() == 0) ? 80 : 8000); -+#endif -+ sin6->sin6_addr = in6addr_any; -+ -+ lsopt.socklen = sizeof(struct sockaddr_in6); -+#else - sin = &lsopt.u.sockaddr_in; - - sin->sin_family = AF_INET; -@@ -2537,6 +2554,7 @@ - sin->sin_addr.s_addr = INADDR_ANY; - - lsopt.socklen = sizeof(struct sockaddr_in); -+#endif - - lsopt.backlog = NGX_LISTEN_BACKLOG; - lsopt.rcvbuf = -1; |