Changes with Apache 2.4.17

  *) mod_http2: added donated HTTP/2 implementation via core module. Similar
     configuration options to mod_ssl.

  *) mod_proxy: don't recyle backend announced "Connection: close" connections
     to avoid reusing it should the close be effective after some new request
     is ready to be sent.

  *) mod_substitute: Allow to configure the patterns merge order with the new
     SubstituteInheritBefore on|off directive.

  *) mod_proxy: Fix ProxySourceAddress binding failure with AH00938.

  *) mod_ssl: Support compilation against libssl built with OPENSSL_NO_SSL3,
     and change the compiled-in default for SSL[Proxy]Protocol to "all -SSLv3",
     in accordance with RFC 7568.

  *) mod_ssl: append :!aNULL:!eNULL:!EXP to the cipher string settings,
     instead of prepending !aNULL:!eNULL:!EXP: (as was the case in 2.4.7
     and later). Enables support for configuring the SUITEB* cipher
     strings introduced in OpenSSL 1.0.2.

  *) mod_ssl: Add support for extracting the msUPN and dnsSRV forms
     of subjectAltName entries of type "otherName" into
     SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n environment
     variables.

  *) mod_logio: Fix logging of %^FB (time to first byte) on the first request on
     an SSL connection.

  *) mod_cache: r->err_headers_out is not merged into
     r->headers when mod_cache is enabled and the response
     is cached for the first time.

  *) mod_slotmem_shm: Fix slots/SHM files names on restart for systems that
     can't create new (clear) slots while previous children gracefully stopping
     still use the old ones (e.g. Windows, OS2). mod_proxy_balancer failed to
     restart whenever the number of configured balancers/members changed during
     restart.

  *) core/util_script: make REDIRECT_URL a full URL.

  *) MPMs: Support SO_REUSEPORT to create multiple duplicated listener
     records for scalability.

  *) mod_proxy: Fix a race condition that caused a failed worker to be retried
     before the retry period is over.

  *) mod_autoindex: Allow autoindexes when neither mod_dir nor mod_mime are
     loaded.

  *) mod_rewrite:  Allow cookies set by mod_rewrite to contain ':' by accepting
     ';' as an alternate separator.

  *) apxs: Add HTTPD_VERSION and HTTPD_MMN to the variables available with
     apxs -q.

  *) mod_rewrite: Avoid a crash when lacking correct DB access permissions
     when using RewriteMap with MapType dbd or fastdbd.

  *) mod_authz_dbd: Avoid a crash when lacking correct DB access permissions.

  *) mod_socache_memcache: Add the 'MemcacheConnTTL' directive to control how
     long to keep idle connections with the memcache server(s).
     Change default value from 600 usec (!) to 15 sec.

  *) mod_dir: Prevent the internal identifier "httpd/unix-directory" from
     appearing as a Content-Type response header when requests for a directory
     are rewritten by mod_rewrite.

4 files changed, 28 insertions, 17 deletions

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index fb47a21d73f..a6eb4b4fff4 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2015/09/01 08:26:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.39 2015/10/17 10:16:35 adam Exp $
 
-DISTNAME=	httpd-2.4.16
+DISTNAME=	httpd-2.4.17
 PKGNAME=	${DISTNAME:S/httpd/apache/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
diff --git a/www/apache24/PLIST b/www/apache24/PLIST
index d603c7ab058..e2b21fc06c3 100644
--- a/www/apache24/PLIST
+++ b/www/apache24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2015/09/01 08:26:05 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.20 2015/10/17 10:16:35 adam Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -119,6 +119,7 @@ lib/httpd/mod_filter.so
 lib/httpd/mod_headers.so
 lib/httpd/mod_heartbeat.so
 lib/httpd/mod_heartmonitor.so
+${PLIST.http2}lib/httpd/mod_http2.so
 lib/httpd/mod_include.so
 lib/httpd/mod_info.so
 lib/httpd/mod_lbmethod_bybusyness.so
@@ -1279,6 +1280,8 @@ share/httpd/manual/mod/mod_heartbeat.html.fr
 share/httpd/manual/mod/mod_heartmonitor.html
 share/httpd/manual/mod/mod_heartmonitor.html.en
 share/httpd/manual/mod/mod_heartmonitor.html.fr
+share/httpd/manual/mod/mod_http2.html
+share/httpd/manual/mod/mod_http2.html.en
 share/httpd/manual/mod/mod_ident.html
 share/httpd/manual/mod/mod_ident.html.en
 share/httpd/manual/mod/mod_ident.html.fr
diff --git a/www/apache24/distinfo b/www/apache24/distinfo
index 809759e1f65..438d2c1f8cf 100644
--- a/www/apache24/distinfo
+++ b/www/apache24/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.21 2015/07/20 00:08:35 taca Exp $
+$NetBSD: distinfo,v 1.22 2015/10/17 10:16:35 adam Exp $
 
-SHA1 (httpd-2.4.16.tar.bz2) = 9963e7482700dd50c53e47abfe2d1c5068875a9c
-RMD160 (httpd-2.4.16.tar.bz2) = ff29b1885d39e4ee96efdd6678c0881c921dedd8
-Size (httpd-2.4.16.tar.bz2) = 5101005 bytes
+SHA1 (httpd-2.4.17.tar.bz2) = 3a1b0db8b6c71b9c9ac507ba8723b95a8d3da1df
+RMD160 (httpd-2.4.17.tar.bz2) = e237dc50782e9ab7c82afd96195af4115d3a2f96
+SHA512 (httpd-2.4.17.tar.bz2) = d818dbd4b138db592a98fecdf5ae13dfadc19f9553e98bdafbdadd4693ae19bb44c96c8c279e9546978bbce55b9286ce3c4ae69cf701a9812be134a3a517b1f6
+Size (httpd-2.4.17.tar.bz2) = 5157721 bytes
 SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839
 SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
 SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d
diff --git a/www/apache24/options.mk b/www/apache24/options.mk
index e9bd612e7cf..7fe7fb2529d 100644
--- a/www/apache24/options.mk
+++ b/www/apache24/options.mk
@@ -1,14 +1,15 @@
-# $NetBSD: options.mk,v 1.10 2015/06/26 19:25:12 ryoon Exp $
+# $NetBSD: options.mk,v 1.11 2015/10/17 10:16:35 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.apache
-PKG_SUPPORTED_OPTIONS=		lua suexec apache-mpm-event apache-mpm-prefork apache-mpm-worker
+PKG_SUPPORTED_OPTIONS=		apache-mpm-event apache-mpm-prefork apache-mpm-worker \
+				lua http2 suexec
 PKG_SUGGESTED_OPTIONS=		apache-mpm-event apache-mpm-prefork \
 				apache-mpm-worker
 
 .if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.1[0-9])
 PKG_SUPPORTED_OPTIONS+=		privileges
 # Disabled until DTrace support is fully implemented/fixed
-# PKG_SUPPORTED_OPTIONS+=		dtrace
+#PKG_SUPPORTED_OPTIONS+=		dtrace
 .endif
 
 .include "../../mk/bsd.options.mk"
@@ -24,6 +25,7 @@ PKG_SUPPORTED_OPTIONS+=		privileges
 #	worker		hybrid multi-threaded multi-process web server
 #
 PLIST_VARS+=		worker prefork event only-prefork not-only-prefork
+PLIST_VARS+=		http2 lua privileges suexec
 
 .if !empty(PKG_OPTIONS:Mapache-mpm-event)
 MPMS+=			event
@@ -54,7 +56,6 @@ PLIST.not-only-prefork=	yes
 
 BUILD_DEFS+=		APACHE_MODULES
 
-PLIST_VARS+=		suexec
 .if !empty(PKG_OPTIONS:Msuexec)
 BUILD_DEFS+=		APACHE_SUEXEC_PATH
 BUILD_DEFS+=		APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE
@@ -79,22 +80,28 @@ PLIST.suexec=		yes
 SPECIAL_PERMS+=		sbin/suexec ${REAL_ROOT_USER} ${APACHE_GROUP} 4510
 .endif
 
-PLIST_VARS+=		lua
+.if !empty(PKG_OPTIONS:Mhttp2)
+.include "../../www/nghttp2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-nghttp2
+PLIST.http2=		yes
+.else
+CONFIGURE_ARGS+=	--without-nghttp2
+.endif
+
 .if !empty(PKG_OPTIONS:Mlua)
-CONFIGURE_ARGS+=	--enable-lua
 .include "../../lang/lua/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-lua
 PLIST.lua=		yes
 .else
 CONFIGURE_ARGS+=	--disable-lua
 .endif
 
-PLIST_VARS+=		privileges
 .if !empty(PKG_OPTIONS:Mprivileges)
 CONFIGURE_ARGS+=	--enable-privileges
 PLIST.privileges=	yes
 .endif
 
 # DTrace support is manifest, but actually not implemented at all
-# .if !empty(PKG_OPTIONS:Mdtrace)
-# CONFIGURE_ARGS+=	--enable-dtrace
-# .endif
+#.if !empty(PKG_OPTIONS:Mdtrace)
+#CONFIGURE_ARGS+=	--enable-dtrace
+#.endif