From owner-svn-ports-all@freebsd.org  Sat Mar  5 17:42:59 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EDD19DA4B6;
 Sat,  5 Mar 2016 17:42:59 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D4096DB9;
 Sat,  5 Mar 2016 17:42:58 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u25Hgvx1003824;
 Sat, 5 Mar 2016 17:42:57 GMT (envelope-from osa@FreeBSD.org)
Received: (from osa@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u25HgvP3003822;
 Sat, 5 Mar 2016 17:42:57 GMT (envelope-from osa@FreeBSD.org)
Message-Id: <201603051742.u25HgvP3003822@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org
 using -f
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Sat, 5 Mar 2016 17:42:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r410193 - in head/www: nginx nginx-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Mar 2016 17:42:59 -0000

Author: osa
Date: Sat Mar  5 17:42:57 2016
New Revision: 410193
URL: https://svnweb.freebsd.org/changeset/ports/410193

Log:
  Fix third-party accesskey module behaviour when "satisfy any;" defined.
  
  Spotted by:	Oleksandr V. Typlyns'kyi <astral@wangsamp.km.ua>
  Discussion:	http://mailman.nginx.org/pipermail/nginx-ru/2010-March/032654.html (in Russian)

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx/Makefile

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Sat Mar  5 17:18:37 2016	(r410192)
+++ head/www/nginx-devel/Makefile	Sat Mar  5 17:42:57 2016	(r410193)
@@ -1000,6 +1000,11 @@ post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!' \
 		${WRKSRC}/conf/nginx.conf
+.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
+	@${REINPLACE_CMD} \
+		'128s!NGX_OK!NGX_DECLINED!' \
+		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}/ngx_http_accesskey_module.c
+.endif
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
 	@${REINPLACE_CMD} \
 		's!%%GSSAPILIBS%%!${GSSAPILIBS}!' \

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Sat Mar  5 17:18:37 2016	(r410192)
+++ head/www/nginx/Makefile	Sat Mar  5 17:42:57 2016	(r410193)
@@ -964,6 +964,11 @@ post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!' \
 		${WRKSRC}/conf/nginx.conf
+.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
+	@${REINPLACE_CMD} \
+		'128s!NGX_OK!NGX_DECLINED!' \
+		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}/ngx_http_accesskey_module.c
+.endif
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
 	@${REINPLACE_CMD} \
 		's!%%GSSAPILIBS%%!${GSSAPILIBS}!' \