# HG changeset patch # User Petr Sumbera # Date 1396863292 25200 # Node ID 59b817222aaf208e8e6bbb7582017d005356481a # Parent 0bc80ce9fe0fb53489f77fe0e202e811898d33bc 18459410 Upgrade Apache Web Server to version 2.2.27 18454251 problem in UTILITY/APACHE diff -r 0bc80ce9fe0f -r 59b817222aaf components/apache2/Makefile --- a/components/apache2/Makefile Mon Apr 07 02:12:01 2014 -0700 +++ b/components/apache2/Makefile Mon Apr 07 02:34:52 2014 -0700 @@ -18,17 +18,17 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk COMPONENT_NAME= httpd -COMPONENT_VERSION= 2.2.25 +COMPONENT_VERSION= 2.2.27 COMPONENT_PROJECT_URL= http://httpd.apache.org/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:b641b4512f280aaa568eab090ab52fdea86894f9ef22f384811a4572fc405bf3 + sha256:7e58abdc6f30756aafe136d7efb10a79d6ff66f8b68308fd2399cb01ae77895d COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE) CONFIGURE_DEFAULT_DIRS=no diff -r 0bc80ce9fe0f -r 59b817222aaf components/apache2/apache.license --- a/components/apache2/apache.license Mon Apr 07 02:12:01 2014 -0700 +++ b/components/apache2/apache.license Mon Apr 07 02:34:52 2014 -0700 @@ -1,5 +1,5 @@ Apache HTTP Server -Copyright 2013 The Apache Software Foundation. +Copyright 2014 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff -r 0bc80ce9fe0f -r 59b817222aaf components/apache2/documentation.p5m --- a/components/apache2/documentation.p5m Mon Apr 07 02:12:01 2014 -0700 +++ b/components/apache2/documentation.p5m Mon Apr 07 02:34:52 2014 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # \ default facet.doc.html true> @@ -98,14 +98,14 @@ file path=usr/apache2/2.2/manual/developer/debugging.html.en file path=usr/apache2/2.2/manual/developer/documenting.html file path=usr/apache2/2.2/manual/developer/documenting.html.en -file path=usr/apache2/2.2/manual/developer/documenting.html.zh-cn +file path=usr/apache2/2.2/manual/developer/documenting.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/developer/filters.html file path=usr/apache2/2.2/manual/developer/filters.html.en file path=usr/apache2/2.2/manual/developer/hooks.html file path=usr/apache2/2.2/manual/developer/hooks.html.en file path=usr/apache2/2.2/manual/developer/index.html file path=usr/apache2/2.2/manual/developer/index.html.en -file path=usr/apache2/2.2/manual/developer/index.html.zh-cn +file path=usr/apache2/2.2/manual/developer/index.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/developer/modules.html file path=usr/apache2/2.2/manual/developer/modules.html.en file path=usr/apache2/2.2/manual/developer/modules.html.ja.utf8 @@ -131,7 +131,7 @@ file path=usr/apache2/2.2/manual/faq/index.html file path=usr/apache2/2.2/manual/faq/index.html.en file path=usr/apache2/2.2/manual/faq/index.html.tr.utf8 -file path=usr/apache2/2.2/manual/faq/index.html.zh-cn +file path=usr/apache2/2.2/manual/faq/index.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/filter.html file path=usr/apache2/2.2/manual/filter.html.en file path=usr/apache2/2.2/manual/filter.html.es @@ -155,7 +155,7 @@ file path=usr/apache2/2.2/manual/handler.html.ko.euc-kr file path=usr/apache2/2.2/manual/handler.html.ru.koi8-r file path=usr/apache2/2.2/manual/handler.html.tr.utf8 -file path=usr/apache2/2.2/manual/handler.html.zh-cn +file path=usr/apache2/2.2/manual/handler.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/howto/access.html file path=usr/apache2/2.2/manual/howto/access.html.en file path=usr/apache2/2.2/manual/howto/auth.html @@ -178,7 +178,7 @@ file path=usr/apache2/2.2/manual/howto/index.html.en file path=usr/apache2/2.2/manual/howto/index.html.ja.utf8 file path=usr/apache2/2.2/manual/howto/index.html.ko.euc-kr -file path=usr/apache2/2.2/manual/howto/index.html.zh-cn +file path=usr/apache2/2.2/manual/howto/index.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/howto/public_html.html file path=usr/apache2/2.2/manual/howto/public_html.html.en file path=usr/apache2/2.2/manual/howto/public_html.html.ja.utf8 @@ -232,7 +232,7 @@ file path=usr/apache2/2.2/manual/index.html.ko.euc-kr file path=usr/apache2/2.2/manual/index.html.pt-br file path=usr/apache2/2.2/manual/index.html.tr.utf8 -file path=usr/apache2/2.2/manual/index.html.zh-cn +file path=usr/apache2/2.2/manual/index.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/install.html file path=usr/apache2/2.2/manual/install.html.de file path=usr/apache2/2.2/manual/install.html.en @@ -262,7 +262,7 @@ file path=usr/apache2/2.2/manual/misc/index.html.en file path=usr/apache2/2.2/manual/misc/index.html.ko.euc-kr file path=usr/apache2/2.2/manual/misc/index.html.tr.utf8 -file path=usr/apache2/2.2/manual/misc/index.html.zh-cn +file path=usr/apache2/2.2/manual/misc/index.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/misc/password_encryptions.html file path=usr/apache2/2.2/manual/misc/password_encryptions.html.en file path=usr/apache2/2.2/manual/misc/perf-tuning.html @@ -303,7 +303,7 @@ file path=usr/apache2/2.2/manual/mod/directives.html.ko.euc-kr file path=usr/apache2/2.2/manual/mod/directives.html.ru.koi8-r file path=usr/apache2/2.2/manual/mod/directives.html.tr.utf8 -file path=usr/apache2/2.2/manual/mod/directives.html.zh-cn +file path=usr/apache2/2.2/manual/mod/directives.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/mod/event.html file path=usr/apache2/2.2/manual/mod/event.html.en file path=usr/apache2/2.2/manual/mod/index.html @@ -313,7 +313,7 @@ file path=usr/apache2/2.2/manual/mod/index.html.ja.utf8 file path=usr/apache2/2.2/manual/mod/index.html.ko.euc-kr file path=usr/apache2/2.2/manual/mod/index.html.tr.utf8 -file path=usr/apache2/2.2/manual/mod/index.html.zh-cn +file path=usr/apache2/2.2/manual/mod/index.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/mod/mod_actions.html file path=usr/apache2/2.2/manual/mod/mod_actions.html.de file path=usr/apache2/2.2/manual/mod/mod_actions.html.en @@ -374,8 +374,8 @@ file path=usr/apache2/2.2/manual/mod/mod_authz_groupfile.html.ja.utf8 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.en 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 @@ -621,7 +621,7 @@ file path=usr/apache2/2.2/manual/mod/quickreference.html.ko.euc-kr file path=usr/apache2/2.2/manual/mod/quickreference.html.ru.koi8-r file path=usr/apache2/2.2/manual/mod/quickreference.html.tr.utf8 -file path=usr/apache2/2.2/manual/mod/quickreference.html.zh-cn +file path=usr/apache2/2.2/manual/mod/quickreference.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/mod/worker.html file path=usr/apache2/2.2/manual/mod/worker.html.de file path=usr/apache2/2.2/manual/mod/worker.html.en @@ -635,7 +635,7 @@ file path=usr/apache2/2.2/manual/mpm.html.ja.utf8 file path=usr/apache2/2.2/manual/mpm.html.ko.euc-kr file path=usr/apache2/2.2/manual/mpm.html.tr.utf8 -file path=usr/apache2/2.2/manual/mpm.html.zh-cn +file path=usr/apache2/2.2/manual/mpm.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/new_features_2_0.html file path=usr/apache2/2.2/manual/new_features_2_0.html.de file path=usr/apache2/2.2/manual/new_features_2_0.html.en @@ -658,7 +658,7 @@ file path=usr/apache2/2.2/manual/platform/index.html file path=usr/apache2/2.2/manual/platform/index.html.en file path=usr/apache2/2.2/manual/platform/index.html.ko.euc-kr -file path=usr/apache2/2.2/manual/platform/index.html.zh-cn +file path=usr/apache2/2.2/manual/platform/index.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/platform/netware.html file path=usr/apache2/2.2/manual/platform/netware.html.en file path=usr/apache2/2.2/manual/platform/netware.html.ko.euc-kr @@ -749,7 +749,7 @@ file path=usr/apache2/2.2/manual/rewrite/index.html.en file path=usr/apache2/2.2/manual/rewrite/index.html.fr file path=usr/apache2/2.2/manual/rewrite/index.html.tr.utf8 -file path=usr/apache2/2.2/manual/rewrite/index.html.zh-cn +file path=usr/apache2/2.2/manual/rewrite/index.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/rewrite/intro.html file path=usr/apache2/2.2/manual/rewrite/intro.html.en file path=usr/apache2/2.2/manual/rewrite/intro.html.fr @@ -774,12 +774,12 @@ file path=usr/apache2/2.2/manual/sitemap.html.ja.utf8 file path=usr/apache2/2.2/manual/sitemap.html.ko.euc-kr file path=usr/apache2/2.2/manual/sitemap.html.tr.utf8 -file path=usr/apache2/2.2/manual/sitemap.html.zh-cn +file path=usr/apache2/2.2/manual/sitemap.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/ssl/index.html file path=usr/apache2/2.2/manual/ssl/index.html.en file path=usr/apache2/2.2/manual/ssl/index.html.ja.utf8 file path=usr/apache2/2.2/manual/ssl/index.html.tr.utf8 -file path=usr/apache2/2.2/manual/ssl/index.html.zh-cn +file path=usr/apache2/2.2/manual/ssl/index.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/ssl/ssl_compat.html file path=usr/apache2/2.2/manual/ssl/ssl_compat.html.en file path=usr/apache2/2.2/manual/ssl/ssl_faq.html @@ -853,7 +853,7 @@ file path=usr/apache2/2.2/manual/vhosts/index.html.ko.euc-kr file path=usr/apache2/2.2/manual/vhosts/index.html.ru.koi8-r file path=usr/apache2/2.2/manual/vhosts/index.html.tr.utf8 -file path=usr/apache2/2.2/manual/vhosts/index.html.zh-cn +file path=usr/apache2/2.2/manual/vhosts/index.html.zh-cn.utf8 file path=usr/apache2/2.2/manual/vhosts/ip-based.html file path=usr/apache2/2.2/manual/vhosts/ip-based.html.en file path=usr/apache2/2.2/manual/vhosts/ip-based.html.fr