Upgrade from 1.9.0 to 1.9.1.

<ChangeLog>

*) Change: now SSLv3 protocol is disabled by default.

*) Change: some long deprecated directives are not supported anymore.

*) Feature: the "reuseport" parameter of the "listen" directive.
   Thanks to Sepherosa Ziehau and Yingqi Lu.

*) Feature: the $upstream_connect_time variable.

*) Bugfix: in the "hash" directive on big-endian platforms.

*) Bugfix: nginx might fail to start on some old Linux variants; the bug
   had appeared in 1.7.11.

*) Bugfix: in IP address parsing.
   Thanks to Sergey Polovko.

</ChangeLog>

4 files changed, 61 insertions, 6 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index ae362069b1bb..27e49c70c096 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nginx
-PORTVERSION=	1.9.0
-PORTREVISION=	1
+PORTVERSION=	1.9.1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -529,7 +528,8 @@ GIT_DRIZZLE_VERSION=	0-gfba80cf
 MASTER_SITES+=	https://github.com/openresty/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
 DISTFILES+=	drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config \
+		${PATCHDIR}/extra-patch-ngx_http_drizzle_util.c
 .endif
 
 .if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MSET_MISC}
@@ -637,7 +637,8 @@ GIT_NGINX_POSTGRES_VERSION=	1-g49855a0
 MASTER_SITES+=	https://github.com/FRiCKLE/ngx_postgres/tarball/${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}/:postgres
 DISTFILES+=	FRiCKLE-ngx_postgres-${NGINX_POSTGRES_VERSION}-${GIT_NGINX_POSTGRES_VERSION}.tar.gz:postgres
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/FRiCKLE-ngx_postgres-${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres-config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres-config \
+		${PATCHDIR}/extra-patch-ngx_postgres_util.c
 .endif
 
 .if ${PORT_OPTIONS:MRDS_CSV}
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 5b315fb7d893..c27fec0b3ac1 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (nginx-1.9.0.tar.gz) = e12aa1d5b701edde880ebcc7be47ca171c3fbeed8fa7c8c62054a6f19d27f248
-SIZE (nginx-1.9.0.tar.gz) = 854462
+SHA256 (nginx-1.9.1.tar.gz) = 09f555fae694c0944f172b575ad239f56d40d14559d98e843de0a690f38c1dad
+SIZE (nginx-1.9.1.tar.gz) = 855402
 SHA256 (giom-nginx_accept_language_module-2f69842.tar.gz) = fbcdf792160a1eff7b9549aeb5209d6e76716ff8e86b05e42c90b2d2f858e011
 SIZE (giom-nginx_accept_language_module-2f69842.tar.gz) = 3399
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c b/www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c
new file mode 100644
index 000000000000..298bb4a70cb6
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_http_drizzle_util.c
@@ -0,0 +1,39 @@
+--- ../openresty-drizzle-nginx-module-fba80cf/src/ngx_http_drizzle_util.c.orig	2015-05-28 02:39:19.661703000 +0300
++++ ../openresty-drizzle-nginx-module-fba80cf/src/ngx_http_drizzle_util.c	2015-05-28 02:41:12.655554000 +0300
+@@ -114,10 +114,8 @@
+         u->resolved->ctx = NULL;
+     }
+ 
+-    if (u->state && u->state->response_sec) {
+-        tp = ngx_timeofday();
+-        u->state->response_sec = tp->sec - u->state->response_sec;
+-        u->state->response_msec = tp->msec - u->state->response_msec;
++    if (u->state && u->state->response_time) {
++        u->state->response_time = ngx_current_msec - u->state->response_time;
+ 
+         if (u->pipe) {
+             u->state->response_length = u->pipe->read_length;
+@@ -588,10 +586,8 @@
+ 
+     r->connection->log->action = "connecting to upstream";
+ 
+-    if (u->state && u->state->response_sec) {
+-        tp = ngx_timeofday();
+-        u->state->response_sec = tp->sec - u->state->response_sec;
+-        u->state->response_msec = tp->msec - u->state->response_msec;
++    if (u->state && u->state->response_time) {
++        u->state->response_time = ngx_current_msec - u->state->response_time;
+     }
+ 
+     u->state = ngx_array_push(r->upstream_states);
+@@ -603,9 +599,7 @@
+ 
+     ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t));
+ 
+-    tp = ngx_timeofday();
+-    u->state->response_sec = tp->sec;
+-    u->state->response_msec = tp->msec;
++    u->state->response_time = ngx_current_msec - u->state->response_time;
+ 
+     rc = ngx_event_connect_peer(&u->peer);
+ 
diff --git a/www/nginx-devel/files/extra-patch-ngx_postgres_util.c b/www/nginx-devel/files/extra-patch-ngx_postgres_util.c
new file mode 100644
index 000000000000..da112a3f285f
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_postgres_util.c
@@ -0,0 +1,15 @@
+--- ../FRiCKLE-ngx_postgres-49855a0/src/ngx_postgres_util.c.orig	2015-05-28 02:58:30.914607000 +0300
++++ ../FRiCKLE-ngx_postgres-49855a0/src/ngx_postgres_util.c	2015-05-28 02:59:57.539743000 +0300
+@@ -61,10 +61,8 @@
+         u->resolved->ctx = NULL;
+     }
+ 
+-    if (u->state && u->state->response_sec) {
+-        tp = ngx_timeofday();
+-        u->state->response_sec = tp->sec - u->state->response_sec;
+-        u->state->response_msec = tp->msec - u->state->response_msec;
++    if (u->state && u->state->response_time) {
++        u->state->response_time = ngx_current_msec - u->state->response_time;
+ 
+         if (u->pipe) {
+             u->state->response_length = u->pipe->read_length;