# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1364500372 25200
# Node ID 921a947a8d022685a896f23dbd29b73b642f44c3
# Parent  40547dfea7b005fca15264ec9e22ab0503b4ef52
16451216 Upgrade Apache Web Server to version 2.2.24
16404164 problem in UTILITY/APACHE

diff -r 40547dfea7b0 -r 921a947a8d02 components/apache2/Makefile
--- a/components/apache2/Makefile	Thu Mar 28 10:31:00 2013 -0700
+++ b/components/apache2/Makefile	Thu Mar 28 12:52:52 2013 -0700
@@ -18,18 +18,18 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		apache2
-COMPONENT_VERSION=	2.2.23
+COMPONENT_VERSION=	2.2.24
 COMPONENT_PROJECT_URL=	http://httpd.apache.org/
 COMPONENT_SRC_NAME=	httpd
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:227c85a5c57f2edae0c5c54c68ccc127f06f6e7cff5340efa00de04f463fa3a4
+    sha256:df651442b13685b32505df68e6a68e5644f13f032121edac4b240291a568a6f7
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/apache
 
diff -r 40547dfea7b0 -r 921a947a8d02 components/apache2/documentation.p5m
--- a/components/apache2/documentation.p5m	Thu Mar 28 10:31:00 2013 -0700
+++ b/components/apache2/documentation.p5m	Thu Mar 28 12:52:52 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform dir file link hardlink path=usr/apache2/2.2/manual(/.+){0,1}$ -> \
     default facet.doc.html true>
@@ -375,6 +375,7 @@
 file path=usr/apache2/2.2/manual/mod/mod_authz_groupfile.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/mod/mod_authz_host.html
 file path=usr/apache2/2.2/manual/mod/mod_authz_host.html.en
+file path=usr/apache2/2.2/manual/mod/mod_authz_host.html.fr
 file path=usr/apache2/2.2/manual/mod/mod_authz_host.html.ja.utf8
 file path=usr/apache2/2.2/manual/mod/mod_authz_host.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/mod/mod_authz_owner.html