Changes with Apache 2.4.26

  *) HTTP/2 support no longer tagged as "experimental" but is instead considered
     fully production ready.

  *) mod_http2: Fix for possible CPU busy loop introduced in v1.10.3 where a stream may keep
     the session in continuous check for state changes that never happen.

  *) mod_mime: Fix error checking for quoted pairs.

  *) mod_proxy_wstunnel: Add "upgrade" parameter to allow upgrade to other
     protocols.

  *) MPMs unix: Place signals handlers and helpers out of DSOs to avoid
     a possible crash if a signal is caught during (graceful) restart.

  *) core: Deprecate ap_get_basic_auth_pw() and add
     ap_get_basic_auth_components().

  *) mod_rewrite: When a substitution is a fully qualified URL, and the
     scheme/host/port matches the current virtual host, stop interpreting the
     path component as a local path just because the first component of the
     path exists in the filesystem.  Adds RewriteOption "LegacyPrefixDocRoot"
     to revert to previous behavior.

  *) core: ap_parse_form_data() URL-decoding doesn't work on EBCDIC
     platforms.

  *) ab: enable option processing for setting a custom HTTP method also for
     non-SSL builds.

  *) core: EBCDIC fixes for interim responses with additional headers.

  *) mod_ssl: Consistently pass the expected bio_filter_in_ctx_t
     to ssl_io_filter_error().

  *) mod_env: when processing a 'SetEnv' directive, warn if the environment
     variable name includes a '='. It is likely a configuration error.

  *) Evaluate nested If/ElseIf/Else configuration blocks.

  *) mod_rewrite: Add 'BNP' (backreferences-no-plus) flag to RewriteRule to
     allow spaces in backreferences to be encoded as %20 instead of '+'.

  *) mod_rewrite: Add the possibility to limit the escaping to specific
     characters in backreferences by listing them in the B flag.

  *) mod_substitute: Fix spurious AH01328 (Line too long) errors on EBCDIC
     systems.

  *) mod_http2: fail requests without ERROR log in case we need to read interim
     responses and see only garbage. This can happen if proxied servers send
     data where none should be, e.g. a body for a HEAD request.

more...

3 files changed, 19 insertions, 9 deletions

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 4f5bd5b336c..0b849b51988 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.57 2017/05/25 13:38:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.58 2017/06/19 20:01:10 adam Exp $
 #
 # When updating this package, make sure that no strings like
 # "PR 12345" are in the commit message. Upstream likes
 # to reference their own PRs this way, but this ends up
 # in NetBSD GNATS.
 
-DISTNAME=	httpd-2.4.25
+DISTNAME=	httpd-2.4.26
 PKGNAME=	${DISTNAME:S/httpd/apache/}
-PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/}
 MASTER_SITES+=	http://archive.apache.org/dist/httpd/
diff --git a/www/apache24/PLIST b/www/apache24/PLIST
index 76d9cfa0252..8e65793d5ea 100644
--- a/www/apache24/PLIST
+++ b/www/apache24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2016/07/05 16:13:53 taca Exp $
+@comment $NetBSD: PLIST,v 1.23 2017/06/19 20:01:10 adam Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -613,34 +613,42 @@ share/httpd/manual/handler.html.tr.utf8
 share/httpd/manual/handler.html.zh-cn.utf8
 share/httpd/manual/howto/access.html
 share/httpd/manual/howto/access.html.en
+share/httpd/manual/howto/access.html.es
 share/httpd/manual/howto/access.html.fr
 share/httpd/manual/howto/auth.html
 share/httpd/manual/howto/auth.html.en
+share/httpd/manual/howto/auth.html.es
 share/httpd/manual/howto/auth.html.fr
 share/httpd/manual/howto/auth.html.ja.utf8
 share/httpd/manual/howto/auth.html.ko.euc-kr
 share/httpd/manual/howto/auth.html.tr.utf8
 share/httpd/manual/howto/cgi.html
 share/httpd/manual/howto/cgi.html.en
+share/httpd/manual/howto/cgi.html.es
 share/httpd/manual/howto/cgi.html.fr
 share/httpd/manual/howto/cgi.html.ja.utf8
 share/httpd/manual/howto/cgi.html.ko.euc-kr
 share/httpd/manual/howto/htaccess.html
 share/httpd/manual/howto/htaccess.html.en
+share/httpd/manual/howto/htaccess.html.es
 share/httpd/manual/howto/htaccess.html.fr
 share/httpd/manual/howto/htaccess.html.ja.utf8
 share/httpd/manual/howto/htaccess.html.ko.euc-kr
 share/httpd/manual/howto/htaccess.html.pt-br
 share/httpd/manual/howto/http2.html
 share/httpd/manual/howto/http2.html.en
+share/httpd/manual/howto/http2.html.es
+share/httpd/manual/howto/http2.html.fr
 share/httpd/manual/howto/index.html
 share/httpd/manual/howto/index.html.en
+share/httpd/manual/howto/index.html.es
 share/httpd/manual/howto/index.html.fr
 share/httpd/manual/howto/index.html.ja.utf8
 share/httpd/manual/howto/index.html.ko.euc-kr
 share/httpd/manual/howto/index.html.zh-cn.utf8
 share/httpd/manual/howto/public_html.html
 share/httpd/manual/howto/public_html.html.en
+share/httpd/manual/howto/public_html.html.es
 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
@@ -764,6 +772,7 @@ share/httpd/manual/mod/core.html.ja.utf8
 share/httpd/manual/mod/core.html.tr.utf8
 share/httpd/manual/mod/directive-dict.html
 share/httpd/manual/mod/directive-dict.html.en
+share/httpd/manual/mod/directive-dict.html.es
 share/httpd/manual/mod/directive-dict.html.fr
 share/httpd/manual/mod/directive-dict.html.ja.utf8
 share/httpd/manual/mod/directive-dict.html.ko.euc-kr
@@ -888,6 +897,8 @@ share/httpd/manual/mod/mod_autoindex.html.fr
 share/httpd/manual/mod/mod_autoindex.html.ja.utf8
 share/httpd/manual/mod/mod_autoindex.html.ko.euc-kr
 share/httpd/manual/mod/mod_autoindex.html.tr.utf8
+share/httpd/manual/mod/mod_brotli.html
+share/httpd/manual/mod/mod_brotli.html.en
 share/httpd/manual/mod/mod_buffer.html
 share/httpd/manual/mod/mod_buffer.html.en
 share/httpd/manual/mod/mod_buffer.html.fr
diff --git a/www/apache24/distinfo b/www/apache24/distinfo
index 5bf164be457..651c8966f20 100644
--- a/www/apache24/distinfo
+++ b/www/apache24/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.28 2016/12/20 21:06:34 taca Exp $
+$NetBSD: distinfo,v 1.29 2017/06/19 20:01:10 adam Exp $
 
-SHA1 (httpd-2.4.25.tar.bz2) = bd6d138c31c109297da2346c6e7b93b9283993d2
-RMD160 (httpd-2.4.25.tar.bz2) = 6dd0e159f8ff4bb0112476bbee038bd855057c10
-SHA512 (httpd-2.4.25.tar.bz2) = 6ba4ce1dcef71416cf1c0de2468c002767b5637a75744daf5beb0edd045749a751b3826c4132f594c48e4b33ca8e1b25ebfb63ac4c8b759ca066a89d3261fb22
-Size (httpd-2.4.25.tar.bz2) = 6398218 bytes
+SHA1 (httpd-2.4.26.tar.bz2) = b10b0f569a0e5adfef61d8c7f0813d42046e399a
+RMD160 (httpd-2.4.26.tar.bz2) = 0781ad3f95c6c4e0e03553b6bd9e43f48f327a98
+SHA512 (httpd-2.4.26.tar.bz2) = 4b32f01f17c912011f24bf3991430d474be13836af41b26c072e3c1eab2b45a3c52851eb00423e046c59fc16e1f501d64daaee3f2469b2745857ec1982966c9a
+Size (httpd-2.4.26.tar.bz2) = 6524642 bytes
 SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839
 SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
 SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d