apache: update to 2.4.7

4 files changed, 119 insertions, 51 deletions

diff --git a/apache/.footprint b/apache/.footprint
index a1505a689..b4434d3f7 100644
--- a/apache/.footprint
+++ b/apache/.footprint
@@ -12,6 +12,7 @@ drwxr-xr-x	root/root	etc/apache/extra/
 -rw-r--r--	root/root	etc/apache/extra/httpd-ssl.conf
 -rw-r--r--	root/root	etc/apache/extra/httpd-userdir.conf
 -rw-r--r--	root/root	etc/apache/extra/httpd-vhosts.conf
+-rw-r--r--	root/root	etc/apache/extra/proxy-html.conf
 -rw-r--r--	root/root	etc/apache/httpd.conf
 -rw-r--r--	root/root	etc/apache/magic
 -rw-r--r--	root/root	etc/apache/mime.types
@@ -28,21 +29,28 @@ drwxr-xr-x	root/root	etc/apache/original/extra/
 -rw-r--r--	root/root	etc/apache/original/extra/httpd-ssl.conf
 -rw-r--r--	root/root	etc/apache/original/extra/httpd-userdir.conf
 -rw-r--r--	root/root	etc/apache/original/extra/httpd-vhosts.conf
+-rw-r--r--	root/root	etc/apache/original/extra/proxy-html.conf
 -rw-r--r--	root/root	etc/apache/original/httpd.conf
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/apache
-drwxr-xr-x	root/root	etc/ssl/
-drwxr-xr-x	root/root	etc/ssl/certs/
--rw-r--r--	root/root	etc/ssl/certs/apache.crt (EMPTY)
-drwxr-xr-x	root/root	etc/ssl/keys/
--rw-r--r--	root/root	etc/ssl/keys/apache.key (EMPTY)
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/ab
+-rwxr-xr-x	root/root	usr/bin/apxs
+-rwxr-xr-x	root/root	usr/bin/dbmmanage
+-rwxr-xr-x	root/root	usr/bin/htdbm
+-rwxr-xr-x	root/root	usr/bin/htdigest
+-rwxr-xr-x	root/root	usr/bin/htpasswd
+-rwxr-xr-x	root/root	usr/bin/httxt2dbm
+-rwxr-xr-x	root/root	usr/bin/logresolve
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/apache/
 -rw-r--r--	root/root	usr/include/apache/ap_compat.h
 -rw-r--r--	root/root	usr/include/apache/ap_config.h
 -rw-r--r--	root/root	usr/include/apache/ap_config_auto.h
 -rw-r--r--	root/root	usr/include/apache/ap_config_layout.h
+-rw-r--r--	root/root	usr/include/apache/ap_expr.h
+-rw-r--r--	root/root	usr/include/apache/ap_hooks.h
 -rw-r--r--	root/root	usr/include/apache/ap_listen.h
 -rw-r--r--	root/root	usr/include/apache/ap_mmn.h
 -rw-r--r--	root/root	usr/include/apache/ap_mpm.h
@@ -50,6 +58,11 @@ drwxr-xr-x	root/root	usr/include/apache/
 -rw-r--r--	root/root	usr/include/apache/ap_regex.h
 -rw-r--r--	root/root	usr/include/apache/ap_regkey.h
 -rw-r--r--	root/root	usr/include/apache/ap_release.h
+-rw-r--r--	root/root	usr/include/apache/ap_slotmem.h
+-rw-r--r--	root/root	usr/include/apache/ap_socache.h
+-rw-r--r--	root/root	usr/include/apache/apache_noprobes.h
+-rw-r--r--	root/root	usr/include/apache/cache_common.h
+-rw-r--r--	root/root	usr/include/apache/heartbeat.h
 -rw-r--r--	root/root	usr/include/apache/http_config.h
 -rw-r--r--	root/root	usr/include/apache/http_connection.h
 -rw-r--r--	root/root	usr/include/apache/http_core.h
@@ -60,6 +73,7 @@ drwxr-xr-x	root/root	usr/include/apache/
 -rw-r--r--	root/root	usr/include/apache/http_vhost.h
 -rw-r--r--	root/root	usr/include/apache/httpd.h
 -rw-r--r--	root/root	usr/include/apache/mod_auth.h
+-rw-r--r--	root/root	usr/include/apache/mod_cache.h
 -rw-r--r--	root/root	usr/include/apache/mod_cgi.h
 -rw-r--r--	root/root	usr/include/apache/mod_core.h
 -rw-r--r--	root/root	usr/include/apache/mod_dav.h
@@ -67,23 +81,31 @@ drwxr-xr-x	root/root	usr/include/apache/
 -rw-r--r--	root/root	usr/include/apache/mod_include.h
 -rw-r--r--	root/root	usr/include/apache/mod_log_config.h
 -rw-r--r--	root/root	usr/include/apache/mod_proxy.h
+-rw-r--r--	root/root	usr/include/apache/mod_request.h
 -rw-r--r--	root/root	usr/include/apache/mod_rewrite.h
+-rw-r--r--	root/root	usr/include/apache/mod_session.h
+-rw-r--r--	root/root	usr/include/apache/mod_so.h
 -rw-r--r--	root/root	usr/include/apache/mod_ssl.h
 -rw-r--r--	root/root	usr/include/apache/mod_status.h
--rw-r--r--	root/root	usr/include/apache/mpm.h
+-rw-r--r--	root/root	usr/include/apache/mod_unixd.h
+-rw-r--r--	root/root	usr/include/apache/mod_watchdog.h
+-rw-r--r--	root/root	usr/include/apache/mod_xml2enc.h
 -rw-r--r--	root/root	usr/include/apache/mpm_common.h
--rw-r--r--	root/root	usr/include/apache/mpm_default.h
 -rw-r--r--	root/root	usr/include/apache/os.h
 -rw-r--r--	root/root	usr/include/apache/scoreboard.h
 -rw-r--r--	root/root	usr/include/apache/unixd.h
 -rw-r--r--	root/root	usr/include/apache/util_cfgtree.h
 -rw-r--r--	root/root	usr/include/apache/util_charset.h
+-rw-r--r--	root/root	usr/include/apache/util_cookies.h
 -rw-r--r--	root/root	usr/include/apache/util_ebcdic.h
+-rw-r--r--	root/root	usr/include/apache/util_fcgi.h
 -rw-r--r--	root/root	usr/include/apache/util_filter.h
 -rw-r--r--	root/root	usr/include/apache/util_ldap.h
 -rw-r--r--	root/root	usr/include/apache/util_md5.h
+-rw-r--r--	root/root	usr/include/apache/util_mutex.h
 -rw-r--r--	root/root	usr/include/apache/util_script.h
 -rw-r--r--	root/root	usr/include/apache/util_time.h
+-rw-r--r--	root/root	usr/include/apache/util_varbuf.h
 -rw-r--r--	root/root	usr/include/apache/util_xml.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/apache/
@@ -98,100 +120,134 @@ drwxr-xr-x	root/root	usr/lib/apache/build/
 -rw-r--r--	root/root	usr/lib/apache/build/rules.mk
 -rw-r--r--	root/root	usr/lib/apache/build/special.mk
 -rw-r--r--	root/root	usr/lib/apache/httpd.exp
+-rwxr-xr-x	root/root	usr/lib/apache/mod_access_compat.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_actions.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_alias.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_allowmethods.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_asis.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_auth_basic.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_auth_digest.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_auth_form.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_authn_anon.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_authn_core.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_authn_dbd.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_authn_dbm.so
--rwxr-xr-x	root/root	usr/lib/apache/mod_authn_default.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_authn_file.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_authn_socache.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_authz_core.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_authz_dbd.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_authz_dbm.so
--rwxr-xr-x	root/root	usr/lib/apache/mod_authz_default.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_authz_groupfile.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_authz_host.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_authz_owner.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_authz_user.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_autoindex.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_buffer.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_cache.so
--rwxr-xr-x	root/root	usr/lib/apache/mod_cern_meta.so
--rwxr-xr-x	root/root	usr/lib/apache/mod_cgi.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_cache_disk.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_cache_socache.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_cgid.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_charset_lite.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_data.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_dav.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_dav_fs.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_dav_lock.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_dbd.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_deflate.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_dialup.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_dir.so
--rwxr-xr-x	root/root	usr/lib/apache/mod_disk_cache.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_dumpio.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_echo.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_env.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_expires.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_ext_filter.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_file_cache.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_filter.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_headers.so
--rwxr-xr-x	root/root	usr/lib/apache/mod_ident.so
--rwxr-xr-x	root/root	usr/lib/apache/mod_imagemap.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_heartbeat.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_heartmonitor.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_include.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_info.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_lbmethod_bybusyness.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_lbmethod_byrequests.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_lbmethod_bytraffic.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_lbmethod_heartbeat.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_log_config.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_log_debug.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_log_forensic.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_logio.so
--rwxr-xr-x	root/root	usr/lib/apache/mod_mem_cache.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_macro.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_mime.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_mime_magic.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_mpm_event.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_mpm_prefork.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_mpm_worker.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_negotiation.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_proxy.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_proxy_ajp.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_proxy_balancer.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_proxy_connect.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_proxy_express.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_proxy_fcgi.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_proxy_fdpass.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_proxy_ftp.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_proxy_html.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_proxy_http.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_proxy_scgi.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_proxy_wstunnel.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_ratelimit.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_reflector.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_remoteip.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_reqtimeout.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_request.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_rewrite.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_sed.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_session.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_session_cookie.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_session_dbd.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_setenvif.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_slotmem_plain.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_slotmem_shm.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_socache_dbm.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_socache_memcache.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_socache_shmcb.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_speling.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_ssl.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_status.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_substitute.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_unique_id.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_unixd.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_userdir.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_usertrack.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_version.so
 -rwxr-xr-x	root/root	usr/lib/apache/mod_vhost_alias.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_watchdog.so
+-rwxr-xr-x	root/root	usr/lib/apache/mod_xml2enc.so
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/ab.1.gz
+-rw-r--r--	root/root	usr/man/man1/apxs.1.gz
 -rw-r--r--	root/root	usr/man/man1/dbmmanage.1.gz
 -rw-r--r--	root/root	usr/man/man1/htdbm.1.gz
 -rw-r--r--	root/root	usr/man/man1/htdigest.1.gz
 -rw-r--r--	root/root	usr/man/man1/htpasswd.1.gz
 -rw-r--r--	root/root	usr/man/man1/httxt2dbm.1.gz
+-rw-r--r--	root/root	usr/man/man1/logresolve.1.gz
 drwxr-xr-x	root/root	usr/man/man8/
--rw-r--r--	root/root	usr/man/man8/ab.8.gz
 -rw-r--r--	root/root	usr/man/man8/apachectl.8.gz
--rw-r--r--	root/root	usr/man/man8/apxs.8.gz
+-rw-r--r--	root/root	usr/man/man8/fcgistarter.8.gz
 -rw-r--r--	root/root	usr/man/man8/htcacheclean.8.gz
 -rw-r--r--	root/root	usr/man/man8/httpd.8.gz
--rw-r--r--	root/root	usr/man/man8/logresolve.8.gz
 -rw-r--r--	root/root	usr/man/man8/rotatelogs.8.gz
 -rw-r--r--	root/root	usr/man/man8/suexec.8.gz
 drwxr-xr-x	root/root	usr/sbin/
--rwxr-xr-x	root/root	usr/sbin/ab
 -rwxr-xr-x	root/root	usr/sbin/apachectl
--rwxr-xr-x	root/root	usr/sbin/apxs
 -rwxr-xr-x	root/root	usr/sbin/checkgid
--rwxr-xr-x	root/root	usr/sbin/dbmmanage
 -rw-r--r--	root/root	usr/sbin/envvars
 -rw-r--r--	root/root	usr/sbin/envvars-std
+-rwxr-xr-x	root/root	usr/sbin/fcgistarter
 -rwxr-xr-x	root/root	usr/sbin/htcacheclean
--rwxr-xr-x	root/root	usr/sbin/htdbm
--rwxr-xr-x	root/root	usr/sbin/htdigest
--rwxr-xr-x	root/root	usr/sbin/htpasswd
 -rwxr-xr-x	root/root	usr/sbin/httpd
--rwxr-xr-x	root/root	usr/sbin/httxt2dbm
--rwxr-xr-x	root/root	usr/sbin/logresolve
 -rwxr-xr-x	root/root	usr/sbin/rotatelogs
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
@@ -201,6 +257,8 @@ drwxr-xr-x	root/root	var/run/apache/
 drwxr-xr-x	root/root	var/www/
 drwxr-xr-x	root/root	var/www/cgi-bin/
 -rw-r--r--	root/root	var/www/cgi-bin/printenv
+-rw-r--r--	root/root	var/www/cgi-bin/printenv.vbs
+-rw-r--r--	root/root	var/www/cgi-bin/printenv.wsf
 -rw-r--r--	root/root	var/www/cgi-bin/test-cgi
 drwxr-xr-x	root/root	var/www/error/
 -rw-r--r--	root/root	var/www/error/HTTP_BAD_GATEWAY.html.var
@@ -235,9 +293,9 @@ drwxr-xr-x	root/root	var/www/icons/
 -rw-r--r--	root/root	var/www/icons/alert.red.png
 -rw-r--r--	root/root	var/www/icons/apache_pb.gif
 -rw-r--r--	root/root	var/www/icons/apache_pb.png
+-rw-r--r--	root/root	var/www/icons/apache_pb.svg
 -rw-r--r--	root/root	var/www/icons/apache_pb2.gif
 -rw-r--r--	root/root	var/www/icons/apache_pb2.png
--rw-r--r--	root/root	var/www/icons/apache_pb2_ani.gif
 -rw-r--r--	root/root	var/www/icons/back.gif
 -rw-r--r--	root/root	var/www/icons/back.png
 -rw-r--r--	root/root	var/www/icons/ball.gray.gif
@@ -316,6 +374,23 @@ drwxr-xr-x	root/root	var/www/icons/
 -rw-r--r--	root/root	var/www/icons/link.png
 -rw-r--r--	root/root	var/www/icons/movie.gif
 -rw-r--r--	root/root	var/www/icons/movie.png
+-rw-r--r--	root/root	var/www/icons/odf6odb.png
+-rw-r--r--	root/root	var/www/icons/odf6odc.png
+-rw-r--r--	root/root	var/www/icons/odf6odf.png
+-rw-r--r--	root/root	var/www/icons/odf6odg.png
+-rw-r--r--	root/root	var/www/icons/odf6odi.png
+-rw-r--r--	root/root	var/www/icons/odf6odm.png
+-rw-r--r--	root/root	var/www/icons/odf6odp.png
+-rw-r--r--	root/root	var/www/icons/odf6ods.png
+-rw-r--r--	root/root	var/www/icons/odf6odt.png
+-rw-r--r--	root/root	var/www/icons/odf6otc.png
+-rw-r--r--	root/root	var/www/icons/odf6otf.png
+-rw-r--r--	root/root	var/www/icons/odf6otg.png
+-rw-r--r--	root/root	var/www/icons/odf6oth.png
+-rw-r--r--	root/root	var/www/icons/odf6oti.png
+-rw-r--r--	root/root	var/www/icons/odf6otp.png
+-rw-r--r--	root/root	var/www/icons/odf6ots.png
+-rw-r--r--	root/root	var/www/icons/odf6ott.png
 -rw-r--r--	root/root	var/www/icons/p.gif
 -rw-r--r--	root/root	var/www/icons/p.png
 -rw-r--r--	root/root	var/www/icons/patch.gif
@@ -375,12 +450,12 @@ drwxr-xr-x	root/root	var/www/icons/small/
 -rw-r--r--	root/root	var/www/icons/small/compressed.png
 -rw-r--r--	root/root	var/www/icons/small/continued.gif
 -rw-r--r--	root/root	var/www/icons/small/continued.png
--rw-r--r--	root/root	var/www/icons/small/dir.gif
--rw-r--r--	root/root	var/www/icons/small/dir.png
--rw-r--r--	root/root	var/www/icons/small/dir2.gif
--rw-r--r--	root/root	var/www/icons/small/dir2.png
 -rw-r--r--	root/root	var/www/icons/small/doc.gif
 -rw-r--r--	root/root	var/www/icons/small/doc.png
+-rw-r--r--	root/root	var/www/icons/small/folder.gif
+-rw-r--r--	root/root	var/www/icons/small/folder.png
+-rw-r--r--	root/root	var/www/icons/small/folder2.gif
+-rw-r--r--	root/root	var/www/icons/small/folder2.png
 -rw-r--r--	root/root	var/www/icons/small/forward.gif
 -rw-r--r--	root/root	var/www/icons/small/forward.png
 -rw-r--r--	root/root	var/www/icons/small/generic.gif
@@ -427,6 +502,7 @@ drwxr-xr-x	root/root	var/www/icons/small/
 -rw-r--r--	root/root	var/www/icons/sphere1.png
 -rw-r--r--	root/root	var/www/icons/sphere2.gif
 -rw-r--r--	root/root	var/www/icons/sphere2.png
+-rw-r--r--	root/root	var/www/icons/svg.png
 -rw-r--r--	root/root	var/www/icons/tar.gif
 -rw-r--r--	root/root	var/www/icons/tar.png
 -rw-r--r--	root/root	var/www/icons/tex.gif
@@ -447,3 +523,4 @@ drwxr-xr-x	root/root	var/www/icons/small/
 -rw-r--r--	root/root	var/www/icons/world1.png
 -rw-r--r--	root/root	var/www/icons/world2.gif
 -rw-r--r--	root/root	var/www/icons/world2.png
+-rw-r--r--	root/root	var/www/icons/xml.png
diff --git a/apache/.md5sum b/apache/.md5sum
index c2b5a254b..bc1cd8c6e 100644
--- a/apache/.md5sum
+++ b/apache/.md5sum
@@ -1,4 +1,3 @@
-e0514e5840c0e58cc4e7982a7e14fc4b  apache
-4abb5cfa1e5d4145e26b0f89d324aeda  apache-ssl_cert.patch
+3d5c72057b79a180797424f8ca661adf  apache
 bd931fee9d102c361e95ad318d199674  crux.layout
-254eda547f8d624604e4bf403241e617  httpd-2.2.26.tar.bz2
+170d7fb6fe5f28b87d1878020a9ab94e  httpd-2.4.7.tar.bz2
diff --git a/apache/Pkgfile b/apache/Pkgfile
index 74e1f2b1a..e66001eeb 100644
--- a/apache/Pkgfile
+++ b/apache/Pkgfile
@@ -1,20 +1,20 @@
-# Description: Apache HTTP server version 2.2.x
+# Description: Apache HTTP server version 2.4.x
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 # URL:         http://httpd.apache.org/
-# Depends on:  apr libpcre openssl zlib
+# Depends on:  apr libpcre openssl zlib libxml2
 # Group:       apache
 
 name=apache
-version=2.2.26
+version=2.4.7
 release=1
 source=(http://www.apache.org/dist/httpd/httpd-$version.tar.bz2 \
-        $name-ssl_cert.patch crux.layout apache)
+        crux.layout apache)
 
 build(){
    cd httpd-$version
 
-   patch -p1 < $SRC/$name-ssl_cert.patch
    cat $SRC/crux.layout >> config.layout
+   sed -ri '/^(User|Group)/s/daemon/www/' docs/conf/httpd.conf.in
 
    ./configure --enable-layout=CRUX \
                --with-apr=/usr \
@@ -23,20 +23,12 @@ build(){
                --enable-so \
                --enable-modules=all \
                --enable-mods-shared=all \
-               --enable-ssl \
-               --enable-proxy \
-               --enable-cache --enable-{disk,file,mem}-cache \
-               --with-mpm=prefork
+               --enable-mpms-shared=all
    make 
    make -j1 DESTDIR=$PKG install
 
-   mkdir -p $PKG/etc/ssl/{keys,certs}
-   touch $PKG/etc/ssl/keys/apache.key
-   touch $PKG/etc/ssl/certs/apache.crt
    install -D -m 755 $SRC/apache $PKG/etc/rc.d/apache
 
-   sed -ri '/^(User|Group)/s/daemon/www/' $PKG/etc/apache/httpd.conf
-   sed -i '1s|local/||' $PKG/var/www/cgi-bin/printenv
-   rm -R $PKG/{var/www/htdocs/*,usr/bin}
+   rm -r $PKG/var/www/htdocs/*
    rm $PKG/var/www/{error,icons}/README*
 }
diff --git a/apache/apache b/apache/apache
index c992f2b83..25322a563 100644
--- a/apache/apache
+++ b/apache/apache
@@ -3,8 +3,8 @@
 # /etc/rc.d/apache: start/stop/restart apache HTTP server
 #
 
-KEY=/etc/ssl/keys/apache.key
-CRT=/etc/ssl/certs/apache.crt
+KEY=/etc/apache/server.key
+CRT=/etc/apache/server.crt
 
 case $1 in
 start)