# HG changeset patch
# User Jon Tibble <meths@btinternet.com>
# Date 1384805656 0
# Node ID 2907cc8807f47b8cd4528efb68cbadc95f27e5e5
# Parent  a5aeb10de83158a4dfc3f229202a2e16cf95c998
Bump Apache 2 to 2.2.26

diff -r a5aeb10de831 -r 2907cc8807f4 usr/src/cmd/apache2/METADATA
--- a/usr/src/cmd/apache2/METADATA	Mon Nov 18 20:10:04 2013 +0000
+++ b/usr/src/cmd/apache2/METADATA	Mon Nov 18 20:14:16 2013 +0000
@@ -1,10 +1,10 @@
 NAME:             httpd
-VERSION:          2.2.25
+VERSION:          2.2.26
 DESCRIPTION:      Apache HTTP Server Version 2.2
 LICENSE:          Apache v2.0, BSD-like
 PACKAGE:          SUNWapch22d SUNWapch22r SUNWapch22u
 PROJECT_URL:      http://httpd.apache.org
-SOURCE_DOWNLOAD:  http://archive.apache.org/dist/httpd/httpd-2.2.25.tar.gz
+SOURCE_DOWNLOAD:  http://archive.apache.org/dist/httpd/httpd-2.2.26.tar.gz
 SUPPORT:          C
 BUGTRAQ:          solaris/utility/apache
 OSR:              7336
diff -r a5aeb10de831 -r 2907cc8807f4 usr/src/cmd/apache2/apache.build.env
--- a/usr/src/cmd/apache2/apache.build.env	Mon Nov 18 20:10:04 2013 +0000
+++ b/usr/src/cmd/apache2/apache.build.env	Mon Nov 18 20:14:16 2013 +0000
@@ -25,7 +25,7 @@
 #ident	"@(#)apache.build.env	1.8	10/08/09 SMI"	
 #
 
-APACHE_VERSION=2.2.25
+APACHE_VERSION=2.2.26
 APACHE_VERSION_DIR=2.2
 APACHE_DIR=httpd-${APACHE_VERSION}
 APACHE_PREFORK_DIR=${APACHE_DIR}-prefork
diff -r a5aeb10de831 -r 2907cc8807f4 usr/src/cmd/apache2/httpd-2.2.25.tar.gz
Binary file usr/src/cmd/apache2/httpd-2.2.25.tar.gz has changed
diff -r a5aeb10de831 -r 2907cc8807f4 usr/src/cmd/apache2/httpd-2.2.26.tar.gz
Binary file usr/src/cmd/apache2/httpd-2.2.26.tar.gz has changed