Changes with Apache 2.4.20

  *) core: Do not read .htaccess if AllowOverride and AllowOverrideList
     are "None". PR 58528.

  *) mod_proxy_express: Fix possible use of DB handle after close.  PR 59230.

  *) core/util_script: relax alphanumeric filter of enviroment variable names
     on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al.
     unadulterated in 64 bit versions of Windows. PR 46751.

  *) mod_http2: incrementing keepalives on each request started so that logging
     %k gives increasing numbers per master http2 connection.
     New documented variables in env, usable in custom log formats: H2_PUSH,
     H2_PUSHED, H2_PUSHED_ON, H2_STREAM_ID and H2_STREAM_TAG.

  *) mod_http2: more efficient passing of response bodies with less contention
     and file bucket forwarding.

  *) mod_http2: fix for missing score board updates on request count, fix for
     memory leak on slave connection reuse.

  *) mod_http2: Fix build on Windows from dsp files.

3 files changed, 15 insertions, 297 deletions

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index b2fde6580bb..9d1f4805b88 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2016/03/05 11:27:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.44 2016/04/14 12:16:10 adam Exp $
 
-DISTNAME=	httpd-2.4.18
+DISTNAME=	httpd-2.4.20
 PKGNAME=	${DISTNAME:S/httpd/apache/}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
 		http://archive.apache.org/dist/httpd/ \
diff --git a/www/apache24/PLIST b/www/apache24/PLIST
index e2b21fc06c3..bbb9b7a1efd 100644
--- a/www/apache24/PLIST
+++ b/www/apache24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2015/10/17 10:16:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2016/04/14 12:16:10 adam Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -49,6 +49,7 @@ include/httpd/mod_rewrite.h
 include/httpd/mod_session.h
 include/httpd/mod_so.h
 include/httpd/mod_ssl.h
+include/httpd/mod_ssl_openssl.h
 include/httpd/mod_status.h
 include/httpd/mod_unixd.h
 include/httpd/mod_watchdog.h
@@ -495,294 +496,6 @@ share/httpd/icons/world1.png
 share/httpd/icons/world2.gif
 share/httpd/icons/world2.png
 share/httpd/icons/xml.png
-share/examples/httpd/extra/httpd-autoindex.conf
-share/examples/httpd/extra/httpd-dav.conf
-share/examples/httpd/extra/httpd-default.conf
-share/examples/httpd/extra/httpd-info.conf
-share/examples/httpd/extra/httpd-languages.conf
-share/examples/httpd/extra/httpd-manual.conf
-share/examples/httpd/extra/httpd-mpm.conf
-share/examples/httpd/extra/httpd-multilang-errordoc.conf
-share/examples/httpd/extra/httpd-ssl.conf
-share/examples/httpd/extra/httpd-userdir.conf
-share/examples/httpd/extra/httpd-vhosts.conf
-share/examples/httpd/extra/proxy-html.conf
-share/examples/httpd/httpd.conf
-share/examples/httpd/magic
-share/examples/httpd/mime.types
-share/httpd/build/config.nice
-share/httpd/build/config_vars.mk
-share/httpd/build/instdso.sh
-share/httpd/build/library.mk
-share/httpd/build/libtool
-share/httpd/build/ltlib.mk
-share/httpd/build/mkdir.sh
-share/httpd/build/program.mk
-share/httpd/build/rules.mk
-share/httpd/build/special.mk
-share/httpd/error/HTTP_BAD_GATEWAY.html.var
-share/httpd/error/HTTP_BAD_REQUEST.html.var
-share/httpd/error/HTTP_FORBIDDEN.html.var
-share/httpd/error/HTTP_GONE.html.var
-share/httpd/error/HTTP_INTERNAL_SERVER_ERROR.html.var
-share/httpd/error/HTTP_LENGTH_REQUIRED.html.var
-share/httpd/error/HTTP_METHOD_NOT_ALLOWED.html.var
-share/httpd/error/HTTP_NOT_FOUND.html.var
-share/httpd/error/HTTP_NOT_IMPLEMENTED.html.var
-share/httpd/error/HTTP_PRECONDITION_FAILED.html.var
-share/httpd/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-share/httpd/error/HTTP_REQUEST_TIME_OUT.html.var
-share/httpd/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-share/httpd/error/HTTP_SERVICE_UNAVAILABLE.html.var
-share/httpd/error/HTTP_UNAUTHORIZED.html.var
-share/httpd/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-share/httpd/error/HTTP_VARIANT_ALSO_VARIES.html.var
-share/httpd/error/README
-share/httpd/error/contact.html.var
-share/httpd/error/include/bottom.html
-share/httpd/error/include/spacer.html
-share/httpd/error/include/top.html
-share/httpd/htdocs/index.html
-share/httpd/icons/README
-share/httpd/icons/README.html
-share/httpd/icons/a.gif
-share/httpd/icons/a.png
-share/httpd/icons/alert.black.gif
-share/httpd/icons/alert.black.png
-share/httpd/icons/alert.red.gif
-share/httpd/icons/alert.red.png
-share/httpd/icons/apache_pb.gif
-share/httpd/icons/apache_pb.png
-share/httpd/icons/apache_pb.svg
-share/httpd/icons/apache_pb2.gif
-share/httpd/icons/apache_pb2.png
-share/httpd/icons/back.gif
-share/httpd/icons/back.png
-share/httpd/icons/ball.gray.gif
-share/httpd/icons/ball.gray.png
-share/httpd/icons/ball.red.gif
-share/httpd/icons/ball.red.png
-share/httpd/icons/binary.gif
-share/httpd/icons/binary.png
-share/httpd/icons/binhex.gif
-share/httpd/icons/binhex.png
-share/httpd/icons/blank.gif
-share/httpd/icons/blank.png
-share/httpd/icons/bomb.gif
-share/httpd/icons/bomb.png
-share/httpd/icons/box1.gif
-share/httpd/icons/box1.png
-share/httpd/icons/box2.gif
-share/httpd/icons/box2.png
-share/httpd/icons/broken.gif
-share/httpd/icons/broken.png
-share/httpd/icons/burst.gif
-share/httpd/icons/burst.png
-share/httpd/icons/c.gif
-share/httpd/icons/c.png
-share/httpd/icons/comp.blue.gif
-share/httpd/icons/comp.blue.png
-share/httpd/icons/comp.gray.gif
-share/httpd/icons/comp.gray.png
-share/httpd/icons/compressed.gif
-share/httpd/icons/compressed.png
-share/httpd/icons/continued.gif
-share/httpd/icons/continued.png
-share/httpd/icons/dir.gif
-share/httpd/icons/dir.png
-share/httpd/icons/diskimg.gif
-share/httpd/icons/diskimg.png
-share/httpd/icons/down.gif
-share/httpd/icons/down.png
-share/httpd/icons/dvi.gif
-share/httpd/icons/dvi.png
-share/httpd/icons/f.gif
-share/httpd/icons/f.png
-share/httpd/icons/folder.gif
-share/httpd/icons/folder.open.gif
-share/httpd/icons/folder.open.png
-share/httpd/icons/folder.png
-share/httpd/icons/folder.sec.gif
-share/httpd/icons/folder.sec.png
-share/httpd/icons/forward.gif
-share/httpd/icons/forward.png
-share/httpd/icons/generic.gif
-share/httpd/icons/generic.png
-share/httpd/icons/generic.red.gif
-share/httpd/icons/generic.red.png
-share/httpd/icons/generic.sec.gif
-share/httpd/icons/generic.sec.png
-share/httpd/icons/hand.right.gif
-share/httpd/icons/hand.right.png
-share/httpd/icons/hand.up.gif
-share/httpd/icons/hand.up.png
-share/httpd/icons/icon.sheet.gif
-share/httpd/icons/icon.sheet.png
-share/httpd/icons/image1.gif
-share/httpd/icons/image1.png
-share/httpd/icons/image2.gif
-share/httpd/icons/image2.png
-share/httpd/icons/image3.gif
-share/httpd/icons/image3.png
-share/httpd/icons/index.gif
-share/httpd/icons/index.png
-share/httpd/icons/layout.gif
-share/httpd/icons/layout.png
-share/httpd/icons/left.gif
-share/httpd/icons/left.png
-share/httpd/icons/link.gif
-share/httpd/icons/link.png
-share/httpd/icons/movie.gif
-share/httpd/icons/movie.png
-share/httpd/icons/odf6odb.png
-share/httpd/icons/odf6odc.png
-share/httpd/icons/odf6odf.png
-share/httpd/icons/odf6odg.png
-share/httpd/icons/odf6odi.png
-share/httpd/icons/odf6odm.png
-share/httpd/icons/odf6odp.png
-share/httpd/icons/odf6ods.png
-share/httpd/icons/odf6odt.png
-share/httpd/icons/odf6otc.png
-share/httpd/icons/odf6otf.png
-share/httpd/icons/odf6otg.png
-share/httpd/icons/odf6oth.png
-share/httpd/icons/odf6oti.png
-share/httpd/icons/odf6otp.png
-share/httpd/icons/odf6ots.png
-share/httpd/icons/odf6ott.png
-share/httpd/icons/p.gif
-share/httpd/icons/p.png
-share/httpd/icons/patch.gif
-share/httpd/icons/patch.png
-share/httpd/icons/pdf.gif
-share/httpd/icons/pdf.png
-share/httpd/icons/pie0.gif
-share/httpd/icons/pie0.png
-share/httpd/icons/pie1.gif
-share/httpd/icons/pie1.png
-share/httpd/icons/pie2.gif
-share/httpd/icons/pie2.png
-share/httpd/icons/pie3.gif
-share/httpd/icons/pie3.png
-share/httpd/icons/pie4.gif
-share/httpd/icons/pie4.png
-share/httpd/icons/pie5.gif
-share/httpd/icons/pie5.png
-share/httpd/icons/pie6.gif
-share/httpd/icons/pie6.png
-share/httpd/icons/pie7.gif
-share/httpd/icons/pie7.png
-share/httpd/icons/pie8.gif
-share/httpd/icons/pie8.png
-share/httpd/icons/portal.gif
-share/httpd/icons/portal.png
-share/httpd/icons/ps.gif
-share/httpd/icons/ps.png
-share/httpd/icons/quill.gif
-share/httpd/icons/quill.png
-share/httpd/icons/right.gif
-share/httpd/icons/right.png
-share/httpd/icons/screw1.gif
-share/httpd/icons/screw1.png
-share/httpd/icons/screw2.gif
-share/httpd/icons/screw2.png
-share/httpd/icons/script.gif
-share/httpd/icons/script.png
-share/httpd/icons/small/back.gif
-share/httpd/icons/small/back.png
-share/httpd/icons/small/binary.gif
-share/httpd/icons/small/binary.png
-share/httpd/icons/small/binhex.gif
-share/httpd/icons/small/binhex.png
-share/httpd/icons/small/blank.gif
-share/httpd/icons/small/blank.png
-share/httpd/icons/small/broken.gif
-share/httpd/icons/small/broken.png
-share/httpd/icons/small/burst.gif
-share/httpd/icons/small/burst.png
-share/httpd/icons/small/comp1.gif
-share/httpd/icons/small/comp1.png
-share/httpd/icons/small/comp2.gif
-share/httpd/icons/small/comp2.png
-share/httpd/icons/small/compressed.gif
-share/httpd/icons/small/compressed.png
-share/httpd/icons/small/continued.gif
-share/httpd/icons/small/continued.png
-share/httpd/icons/small/doc.gif
-share/httpd/icons/small/doc.png
-share/httpd/icons/small/folder.gif
-share/httpd/icons/small/folder.png
-share/httpd/icons/small/folder2.gif
-share/httpd/icons/small/folder2.png
-share/httpd/icons/small/forward.gif
-share/httpd/icons/small/forward.png
-share/httpd/icons/small/generic.gif
-share/httpd/icons/small/generic.png
-share/httpd/icons/small/generic2.gif
-share/httpd/icons/small/generic2.png
-share/httpd/icons/small/generic3.gif
-share/httpd/icons/small/generic3.png
-share/httpd/icons/small/image.gif
-share/httpd/icons/small/image.png
-share/httpd/icons/small/image2.gif
-share/httpd/icons/small/image2.png
-share/httpd/icons/small/index.gif
-share/httpd/icons/small/index.png
-share/httpd/icons/small/key.gif
-share/httpd/icons/small/key.png
-share/httpd/icons/small/movie.gif
-share/httpd/icons/small/movie.png
-share/httpd/icons/small/patch.gif
-share/httpd/icons/small/patch.png
-share/httpd/icons/small/ps.gif
-share/httpd/icons/small/ps.png
-share/httpd/icons/small/rainbow.gif
-share/httpd/icons/small/rainbow.png
-share/httpd/icons/small/sound.gif
-share/httpd/icons/small/sound.png
-share/httpd/icons/small/sound2.gif
-share/httpd/icons/small/sound2.png
-share/httpd/icons/small/tar.gif
-share/httpd/icons/small/tar.png
-share/httpd/icons/small/text.gif
-share/httpd/icons/small/text.png
-share/httpd/icons/small/transfer.gif
-share/httpd/icons/small/transfer.png
-share/httpd/icons/small/unknown.gif
-share/httpd/icons/small/unknown.png
-share/httpd/icons/small/uu.gif
-share/httpd/icons/small/uu.png
-share/httpd/icons/sound1.gif
-share/httpd/icons/sound1.png
-share/httpd/icons/sound2.gif
-share/httpd/icons/sound2.png
-share/httpd/icons/sphere1.gif
-share/httpd/icons/sphere1.png
-share/httpd/icons/sphere2.gif
-share/httpd/icons/sphere2.png
-share/httpd/icons/svg.png
-share/httpd/icons/tar.gif
-share/httpd/icons/tar.png
-share/httpd/icons/tex.gif
-share/httpd/icons/tex.png
-share/httpd/icons/text.gif
-share/httpd/icons/text.png
-share/httpd/icons/transfer.gif
-share/httpd/icons/transfer.png
-share/httpd/icons/unknown.gif
-share/httpd/icons/unknown.png
-share/httpd/icons/up.gif
-share/httpd/icons/up.png
-share/httpd/icons/uu.gif
-share/httpd/icons/uu.png
-share/httpd/icons/uuencoded.gif
-share/httpd/icons/uuencoded.png
-share/httpd/icons/world1.gif
-share/httpd/icons/world1.png
-share/httpd/icons/world2.gif
-share/httpd/icons/world2.png
-share/httpd/icons/xml.png
 share/httpd/manual/BUILDING
 share/httpd/manual/LICENSE
 share/httpd/manual/bind.html
@@ -928,12 +641,17 @@ share/httpd/manual/howto/public_html.html.fr
 share/httpd/manual/howto/public_html.html.ja.utf8
 share/httpd/manual/howto/public_html.html.ko.euc-kr
 share/httpd/manual/howto/public_html.html.tr.utf8
+share/httpd/manual/howto/reverse_proxy.html
+share/httpd/manual/howto/reverse_proxy.html.en
 share/httpd/manual/howto/ssi.html
 share/httpd/manual/howto/ssi.html.en
 share/httpd/manual/howto/ssi.html.fr
 share/httpd/manual/howto/ssi.html.ja.utf8
 share/httpd/manual/howto/ssi.html.ko.euc-kr
 share/httpd/manual/images/apache_header.gif
+share/httpd/manual/images/bal-man-b.png
+share/httpd/manual/images/bal-man-w.png
+share/httpd/manual/images/bal-man.png
 share/httpd/manual/images/build_a_mod_2.png
 share/httpd/manual/images/build_a_mod_3.png
 share/httpd/manual/images/build_a_mod_4.png
@@ -960,6 +678,7 @@ share/httpd/manual/images/mod_rewrite_fig1.png
 share/httpd/manual/images/mod_rewrite_fig2.gif
 share/httpd/manual/images/mod_rewrite_fig2.png
 share/httpd/manual/images/pixel.gif
+share/httpd/manual/images/reverse-proxy-arch.png
 share/httpd/manual/images/rewrite_backreferences.png
 share/httpd/manual/images/rewrite_process_uri.png
 share/httpd/manual/images/rewrite_rule_flow.png
diff --git a/www/apache24/distinfo b/www/apache24/distinfo
index 694151f497f..f2d9ecaf38c 100644
--- a/www/apache24/distinfo
+++ b/www/apache24/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2015/12/27 12:50:54 adam Exp $
+$NetBSD: distinfo,v 1.24 2016/04/14 12:16:10 adam Exp $
 
-SHA1 (httpd-2.4.18.tar.bz2) = 271a129f2f04e3aa694e5c2091df9b707bf8ef80
-RMD160 (httpd-2.4.18.tar.bz2) = a9acc9941f54a158db7f66fb4420a9328b3d37c6
-SHA512 (httpd-2.4.18.tar.bz2) = 8e342cc447313c07275869381c2d6f2314a96547f0c86ee1c617975d0f7ad8efb47113ab5995c733108ae4dec31ad79847e397ecea859b60414ffe1680617a31
-Size (httpd-2.4.18.tar.bz2) = 5181291 bytes
+SHA1 (httpd-2.4.20.tar.bz2) = cefe8ea4a3f81c7a08e36c80ebbd792c67ab361b
+RMD160 (httpd-2.4.20.tar.bz2) = 6dc7254363d7de5027604c7604ed6c96b96b1fa4
+SHA512 (httpd-2.4.20.tar.bz2) = 8591e0ca8f1c4755d670f1a8780bb656c62b30635cff1f7d4434f7c5017b99f1b14bbb296da5cdb63cd3bcfa4908b8b5f99a0c036e9e0f0c9514acd2a3cb7e53
+Size (httpd-2.4.20.tar.bz2) = 6331344 bytes
 SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839
 SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
 SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d