Upgrade from 1.11.4 to 1.11.5.

Upgrade third-party njs module to its latest version ee84984.

<ChangeLog>

*) Change: the --with-ipv6 configure option was removed, now IPv6
   support is configured automatically.

*) Change: now if there are no available servers in an upstream, nginx
   will not reset number of failures of all servers as it previously
   did, but will wait for fail_timeout to expire.

*) Feature: the ngx_stream_ssl_preread_module.

*) Feature: the "server" directive in the "upstream" context supports
   the "max_conns" parameter.

*) Feature: the --with-compat configure option.

*) Feature: "manager_files", "manager_threshold", and "manager_sleep"
   parameters of the "proxy_cache_path", "fastcgi_cache_path",
   "scgi_cache_path", and "uwsgi_cache_path" directives.

*) Bugfix: flags passed by the --with-ld-opt configure option were not
   used while building perl module.

*) Bugfix: in the "add_after_body" directive when used with the
   "sub_filter" directive.

*) Bugfix: in the $realip_remote_addr variable.

*) Bugfix: the "dav_access", "proxy_store_access",
   "fastcgi_store_access", "scgi_store_access", and "uwsgi_store_access"
   directives ignored permissions specified for user.

*) Bugfix: unix domain listen sockets might not be inherited during
   binary upgrade on Linux.

*) Bugfix: nginx returned the 400 response on requests with the "-"
   character in the HTTP method.

</ChangeLog>

3 files changed, 14 insertions, 14 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index c6134f95146f..315ba73d7c0a 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nginx
-PORTVERSION=	1.11.4
-PORTREVISION=	1
+PORTVERSION=	1.11.5
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -1010,7 +1009,7 @@ CONFIGURE_ARGS+=--with-http_v2_module
 .if ${PORT_OPTIONS:MNJS}
 GH_ACCOUNT+=	nginx:njs
 GH_PROJECT+=	njs:njs
-GH_TAGNAME+=	0f11ace:njs
+GH_TAGNAME+=	ee84984:njs
 .if !empty(PORT_OPTIONS:MDSO)
 CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_njs}/nginx
 .else
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 456b1e15ccb6..15b0bcdc2a35 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1473890109
-SHA256 (nginx-1.11.4.tar.gz) = 06221c1f43f643bc6bfe5b2c26d19e09f2588d5cde6c65bdb77dfcce7c026b3b
-SIZE (nginx-1.11.4.tar.gz) = 949793
+TIMESTAMP = 1476229849
+SHA256 (nginx-1.11.5.tar.gz) = 223f8a2345a75f891098cf26ccdf208b293350388f51ce69083674c9432db6f6
+SIZE (nginx-1.11.5.tar.gz) = 956517
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9
@@ -123,8 +123,8 @@ SHA256 (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = de784142d867a35ecc5443fa3
 SIZE (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = 2711
 SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
 SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
-SHA256 (nginx-njs-0f11ace_GH0.tar.gz) = 364bd2728c3ee3f5115a0a0115e81639b1c8eca501ac9a9a12156d0cd216cc26
-SIZE (nginx-njs-0f11ace_GH0.tar.gz) = 173651
+SHA256 (nginx-njs-ee84984_GH0.tar.gz) = 5ab1274aa3130cb225d5662afac2caecfd1ff8182c0709c3a2e9c7cfb5124536
+SIZE (nginx-njs-ee84984_GH0.tar.gz) = 184701
 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280
 SHA256 (google-ngx_brotli-ada972b_GH0.tar.gz) = d3d0e22a2629cd017280e05bd3bf05aa7b5c820ebe8c79932ce161243911e776
diff --git a/www/nginx-devel/files/extra-patch-src-http-ngx_http_upstream_round_robin.h b/www/nginx-devel/files/extra-patch-src-http-ngx_http_upstream_round_robin.h
index 9f6d868ff171..84c99aaaed61 100644
--- a/www/nginx-devel/files/extra-patch-src-http-ngx_http_upstream_round_robin.h
+++ b/www/nginx-devel/files/extra-patch-src-http-ngx_http_upstream_round_robin.h
@@ -1,13 +1,14 @@
---- src/http/ngx_http_upstream_round_robin.h.orig	2016-02-24 14:53:24 UTC
-+++ src/http/ngx_http_upstream_round_robin.h
-@@ -35,6 +35,10 @@ struct ngx_http_upstream_rr_peer_s {
+--- src/http/ngx_http_upstream_round_robin.h.orig	2016-10-11 11:03:02.000000000 -0400
++++ src/http/ngx_http_upstream_round_robin.h	2016-10-11 19:56:33.262307000 -0400
+@@ -35,6 +35,11 @@
+ 
      ngx_uint_t                      max_fails;
      time_t                          fail_timeout;
- 
++
 +#if (NGX_HTTP_UPSTREAM_CHECK)
 +    ngx_uint_t                      check_index;
 +#endif
 +
-     ngx_uint_t                      down;          /* unsigned  down:1; */
+     ngx_msec_t                      slow_start;
+     ngx_msec_t                      start_time;
  
- #if (NGX_HTTP_SSL)