Changes 2.2.27:

  *) SECURITY: CVE-2014-0098 (cve.mitre.org)
     Clean up cookie logging with fewer redundant string parsing passes.
     Log only cookies with a value assignment. Prevents segfaults when
     logging truncated cookies.

  *) SECURITY: CVE-2013-6438 (cve.mitre.org)
     mod_dav: Keep track of length of cdata properly when removing
     leading spaces. Eliminates a potential denial of service from
     specifically crafted DAV WRITE requests

  *) core: draft-ietf-httpbis-p1-messaging-23 corrections regarding
     TE/CL conflicts.

  *) mod_proxy_http: Core dumped under high load. PR 50335.

  *) proxy_util: NULL terminate the right buffer in 'send_http_connect'.

  *) mod_proxy: Remove (never documented) <Proxy ~ wildcard-url> syntax which
     is equivalent to <ProxyMatch wildcard-url>.

  *) mod_ldap: Fix a potential memory leak or corruption.

  *) mod_ssl: Do not perform SNI / Host header comparison in case of a
     forward proxy request.

  *) mod_rewrite: Add mod_rewrite.h to the headers installed on Windows.

3 files changed, 27 insertions, 24 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 7f75641fa3c..89ec1631570 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.99 2014/02/17 17:32:55 adam Exp $
+# $NetBSD: Makefile,v 1.100 2014/03/28 11:25:43 adam Exp $
 
-DISTNAME=	httpd-2.2.26
+DISTNAME=	httpd-2.2.27
 PKGNAME=	${DISTNAME:S/httpd/apache/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
diff --git a/www/apache22/PLIST b/www/apache22/PLIST
index 09d90d12497..0860810c3de 100644
--- a/www/apache22/PLIST
+++ b/www/apache22/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2014/03/11 14:05:17 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.24 2014/03/28 11:25:43 adam Exp $
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
@@ -462,14 +462,14 @@ share/httpd/manual/developer/debugging.html
 share/httpd/manual/developer/debugging.html.en
 share/httpd/manual/developer/documenting.html
 share/httpd/manual/developer/documenting.html.en
-share/httpd/manual/developer/documenting.html.zh-cn
+share/httpd/manual/developer/documenting.html.zh-cn.utf8
 share/httpd/manual/developer/filters.html
 share/httpd/manual/developer/filters.html.en
 share/httpd/manual/developer/hooks.html
 share/httpd/manual/developer/hooks.html.en
 share/httpd/manual/developer/index.html
 share/httpd/manual/developer/index.html.en
-share/httpd/manual/developer/index.html.zh-cn
+share/httpd/manual/developer/index.html.zh-cn.utf8
 share/httpd/manual/developer/modules.html
 share/httpd/manual/developer/modules.html.en
 share/httpd/manual/developer/modules.html.ja.utf8
@@ -495,7 +495,7 @@ share/httpd/manual/env.html.tr.utf8
 share/httpd/manual/faq/index.html
 share/httpd/manual/faq/index.html.en
 share/httpd/manual/faq/index.html.tr.utf8
-share/httpd/manual/faq/index.html.zh-cn
+share/httpd/manual/faq/index.html.zh-cn.utf8
 share/httpd/manual/filter.html
 share/httpd/manual/filter.html.en
 share/httpd/manual/filter.html.es
@@ -519,7 +519,7 @@ share/httpd/manual/handler.html.ja.utf8
 share/httpd/manual/handler.html.ko.euc-kr
 share/httpd/manual/handler.html.ru.koi8-r
 share/httpd/manual/handler.html.tr.utf8
-share/httpd/manual/handler.html.zh-cn
+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/auth.html
@@ -542,7 +542,7 @@ share/httpd/manual/howto/index.html
 share/httpd/manual/howto/index.html.en
 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
+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.ja.utf8
@@ -570,6 +570,7 @@ share/httpd/manual/images/mod_filter_new.gif
 share/httpd/manual/images/mod_filter_new.png
 share/httpd/manual/images/mod_filter_new.tr.png
 share/httpd/manual/images/mod_filter_old.gif
+share/httpd/manual/images/mod_filter_old.png
 share/httpd/manual/images/mod_rewrite_fig1.gif
 share/httpd/manual/images/mod_rewrite_fig1.png
 share/httpd/manual/images/mod_rewrite_fig2.gif
@@ -597,7 +598,7 @@ share/httpd/manual/index.html.ja.utf8
 share/httpd/manual/index.html.ko.euc-kr
 share/httpd/manual/index.html.pt-br
 share/httpd/manual/index.html.tr.utf8
-share/httpd/manual/index.html.zh-cn
+share/httpd/manual/index.html.zh-cn.utf8
 share/httpd/manual/install.html
 share/httpd/manual/install.html.de
 share/httpd/manual/install.html.en
@@ -627,7 +628,7 @@ share/httpd/manual/misc/index.html
 share/httpd/manual/misc/index.html.en
 share/httpd/manual/misc/index.html.ko.euc-kr
 share/httpd/manual/misc/index.html.tr.utf8
-share/httpd/manual/misc/index.html.zh-cn
+share/httpd/manual/misc/index.html.zh-cn.utf8
 share/httpd/manual/misc/password_encryptions.html
 share/httpd/manual/misc/password_encryptions.html.en
 share/httpd/manual/misc/perf-tuning.html
@@ -668,7 +669,7 @@ share/httpd/manual/mod/directives.html.ja.utf8
 share/httpd/manual/mod/directives.html.ko.euc-kr
 share/httpd/manual/mod/directives.html.ru.koi8-r
 share/httpd/manual/mod/directives.html.tr.utf8
-share/httpd/manual/mod/directives.html.zh-cn
+share/httpd/manual/mod/directives.html.zh-cn.utf8
 share/httpd/manual/mod/event.html
 share/httpd/manual/mod/event.html.en
 share/httpd/manual/mod/index.html
@@ -678,7 +679,7 @@ share/httpd/manual/mod/index.html.es
 share/httpd/manual/mod/index.html.ja.utf8
 share/httpd/manual/mod/index.html.ko.euc-kr
 share/httpd/manual/mod/index.html.tr.utf8
-share/httpd/manual/mod/index.html.zh-cn
+share/httpd/manual/mod/index.html.zh-cn.utf8
 share/httpd/manual/mod/mod_actions.html
 share/httpd/manual/mod/mod_actions.html.de
 share/httpd/manual/mod/mod_actions.html.en
@@ -986,7 +987,7 @@ share/httpd/manual/mod/quickreference.html.ja.utf8
 share/httpd/manual/mod/quickreference.html.ko.euc-kr
 share/httpd/manual/mod/quickreference.html.ru.koi8-r
 share/httpd/manual/mod/quickreference.html.tr.utf8
-share/httpd/manual/mod/quickreference.html.zh-cn
+share/httpd/manual/mod/quickreference.html.zh-cn.utf8
 share/httpd/manual/mod/worker.html
 share/httpd/manual/mod/worker.html.de
 share/httpd/manual/mod/worker.html.en
@@ -1000,7 +1001,7 @@ share/httpd/manual/mpm.html.fr
 share/httpd/manual/mpm.html.ja.utf8
 share/httpd/manual/mpm.html.ko.euc-kr
 share/httpd/manual/mpm.html.tr.utf8
-share/httpd/manual/mpm.html.zh-cn
+share/httpd/manual/mpm.html.zh-cn.utf8
 share/httpd/manual/new_features_2_0.html
 share/httpd/manual/new_features_2_0.html.de
 share/httpd/manual/new_features_2_0.html.en
@@ -1023,7 +1024,7 @@ share/httpd/manual/platform/ebcdic.html.ko.euc-kr
 share/httpd/manual/platform/index.html
 share/httpd/manual/platform/index.html.en
 share/httpd/manual/platform/index.html.ko.euc-kr
-share/httpd/manual/platform/index.html.zh-cn
+share/httpd/manual/platform/index.html.zh-cn.utf8
 share/httpd/manual/platform/netware.html
 share/httpd/manual/platform/netware.html.en
 share/httpd/manual/platform/netware.html.ko.euc-kr
@@ -1085,7 +1086,7 @@ share/httpd/manual/programs/index.html.ja.utf8
 share/httpd/manual/programs/index.html.ko.euc-kr
 share/httpd/manual/programs/index.html.ru.koi8-r
 share/httpd/manual/programs/index.html.tr.utf8
-share/httpd/manual/programs/index.html.zh-cn
+share/httpd/manual/programs/index.html.zh-cn.utf8
 share/httpd/manual/programs/logresolve.html
 share/httpd/manual/programs/logresolve.html.en
 share/httpd/manual/programs/logresolve.html.ko.euc-kr
@@ -1117,7 +1118,7 @@ share/httpd/manual/rewrite/index.html
 share/httpd/manual/rewrite/index.html.en
 share/httpd/manual/rewrite/index.html.fr
 share/httpd/manual/rewrite/index.html.tr.utf8
-share/httpd/manual/rewrite/index.html.zh-cn
+share/httpd/manual/rewrite/index.html.zh-cn.utf8
 share/httpd/manual/rewrite/intro.html
 share/httpd/manual/rewrite/intro.html.en
 share/httpd/manual/rewrite/intro.html.fr
@@ -1150,12 +1151,12 @@ share/httpd/manual/sitemap.html.es
 share/httpd/manual/sitemap.html.ja.utf8
 share/httpd/manual/sitemap.html.ko.euc-kr
 share/httpd/manual/sitemap.html.tr.utf8
-share/httpd/manual/sitemap.html.zh-cn
+share/httpd/manual/sitemap.html.zh-cn.utf8
 share/httpd/manual/ssl/index.html
 share/httpd/manual/ssl/index.html.en
 share/httpd/manual/ssl/index.html.ja.utf8
 share/httpd/manual/ssl/index.html.tr.utf8
-share/httpd/manual/ssl/index.html.zh-cn
+share/httpd/manual/ssl/index.html.zh-cn.utf8
 share/httpd/manual/ssl/ssl_compat.html
 share/httpd/manual/ssl/ssl_compat.html.en
 share/httpd/manual/ssl/ssl_faq.html
@@ -1187,7 +1188,9 @@ share/httpd/manual/style/lang.dtd
 share/httpd/manual/style/latex/atbeginend.sty
 share/httpd/manual/style/manualpage.dtd
 share/httpd/manual/style/modulesynopsis.dtd
+share/httpd/manual/style/scripts/MINIFY
 share/httpd/manual/style/scripts/prettify.js
+share/httpd/manual/style/scripts/prettify.min.js
 share/httpd/manual/style/sitemap.dtd
 share/httpd/manual/style/version.ent
 share/httpd/manual/suexec.html
@@ -1231,7 +1234,7 @@ share/httpd/manual/vhosts/index.html.ja.utf8
 share/httpd/manual/vhosts/index.html.ko.euc-kr
 share/httpd/manual/vhosts/index.html.ru.koi8-r
 share/httpd/manual/vhosts/index.html.tr.utf8
-share/httpd/manual/vhosts/index.html.zh-cn
+share/httpd/manual/vhosts/index.html.zh-cn.utf8
 share/httpd/manual/vhosts/ip-based.html
 share/httpd/manual/vhosts/ip-based.html.en
 share/httpd/manual/vhosts/ip-based.html.fr
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 5fc937180e6..5b49f78a990 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.58 2014/02/17 17:32:55 adam Exp $
+$NetBSD: distinfo,v 1.59 2014/03/28 11:25:43 adam Exp $
 
-SHA1 (httpd-2.2.26.tar.bz2) = ecfa7dab239ef177668ad1d5cf9d03c4602607b8
-RMD160 (httpd-2.2.26.tar.bz2) = 18a5ed7bae8d9ac7e842b3f4acf2952aca3736d1
-Size (httpd-2.2.26.tar.bz2) = 5390190 bytes
+SHA1 (httpd-2.2.27.tar.bz2) = fd4bf18dd1b3e0d9be9e85ff7e033b2eb8aa4976
+RMD160 (httpd-2.2.27.tar.bz2) = bda89eb8d39c73ace7a0de6804b8831cab9e2476
+Size (httpd-2.2.27.tar.bz2) = 5616798 bytes
 SHA1 (patch-aa) = e0bfdf6bc9cb034bea46a390a12a5508e363c9a7
 SHA1 (patch-ab) = 365cc3b0ac2d9d68ccb94f5699fe168a1c9b0150
 SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad