[apache2] 02/03: Merge tag 'upstream/2.4.7'
Arno Töll
atoell-guest at moszumanska.debian.org
Tue Dec 24 10:55:26 UTC 2013
This is an automated email from the git hooks/post-receive script.
atoell-guest pushed a commit to branch master
in repository apache2.
commit 39c09d872773f846e7e63e219e7213d9bb59bb21
Merge: 753adba 86d5cc7
Author: Arno Töll <arno at debian.org>
Date: Mon Dec 23 23:50:30 2013 -1100
Merge tag 'upstream/2.4.7'
Upstream version 2.4.7
CHANGES | 199 +++++-
CMakeLists.txt | 887 ++++++++++++++++++++++++++
LAYOUT | 1 -
LICENSE | 1 +
Makefile.win | 4 +
NWGNUmakefile | 1 +
README.cmake | 290 +++++++++
build/aix/mkinstallp.ksh | 2 +-
build/apr_common.m4 | 7 +-
build/config.guess | 144 +++--
build/config.sub | 17 +-
build/cpR_noreplace.pl | 71 +++
build/nw_export.inc | 1 +
build/rpm/httpd.spec.in | 1 +
build/win32/httpd.rc | 2 +-
configure | 26 +-
configure.in | 4 +
docs/man/ab.1 | 7 +-
docs/man/tr/apxs.1 | 7 +-
docs/man/tr/fcgistarter.8 | 2 +-
docs/man/tr/htpasswd.1 | 13 +-
docs/man/tr/rotatelogs.8 | 7 +-
docs/man/tr/suexec.8 | 2 +-
docs/manual/bind.html.en | 6 +-
docs/manual/bind.html.fr | 5 +
docs/manual/bind.html.tr.utf8 | 6 +-
docs/manual/configuring.html.en | 2 +-
docs/manual/configuring.html.fr | 2 +-
docs/manual/configuring.html.tr.utf8 | 3 +
docs/manual/convenience.map | 3 +
docs/manual/developer/modguide.html.en | 39 +-
docs/manual/filter.html.fr | 12 +-
docs/manual/getting-started.html | 9 +
docs/manual/getting-started.html.en | 245 +++++++
docs/manual/getting-started.html.fr | 271 ++++++++
docs/manual/index.html.en | 6 +-
docs/manual/index.html.fr | 6 +-
docs/manual/index.html.tr.utf8 | 1 +
docs/manual/install.html.tr.utf8 | 8 +-
docs/manual/logs.html.fr | 12 -
docs/manual/logs.html.tr.utf8 | 1 -
docs/manual/misc/security_tips.html.tr.utf8 | 13 +-
docs/manual/mod/core.html.fr | 2 +-
docs/manual/mod/directives.html.de | 4 +-
docs/manual/mod/directives.html.en | 4 +-
docs/manual/mod/directives.html.es | 4 +-
docs/manual/mod/directives.html.fr | 4 +-
docs/manual/mod/directives.html.ja.utf8 | 4 +-
docs/manual/mod/directives.html.ko.euc-kr | 4 +-
docs/manual/mod/directives.html.tr.utf8 | 4 +-
docs/manual/mod/directives.html.zh-cn | 4 +-
docs/manual/mod/event.html.en | 25 +-
docs/manual/mod/event.html.fr | 24 +-
docs/manual/mod/index.html.de | 2 +-
docs/manual/mod/index.html.en | 2 +-
docs/manual/mod/index.html.es | 2 +-
docs/manual/mod/index.html.fr | 6 +-
docs/manual/mod/index.html.ja.utf8 | 2 +-
docs/manual/mod/index.html.ko.euc-kr | 2 +-
docs/manual/mod/index.html.tr.utf8 | 2 +-
docs/manual/mod/index.html.zh-cn | 2 +-
docs/manual/mod/mod_auth_basic.html.en | 74 +++
docs/manual/mod/mod_auth_basic.html.fr | 87 ++-
docs/manual/mod/mod_auth_basic.html.ja.utf8 | 18 +
docs/manual/mod/mod_auth_basic.html.ko.euc-kr | 18 +
docs/manual/mod/mod_authn_socache.html.en | 13 +-
docs/manual/mod/mod_authn_socache.html.fr | 7 +-
docs/manual/mod/mod_authnz_ldap.html.en | 9 +
docs/manual/mod/mod_authnz_ldap.html.fr | 13 +-
docs/manual/mod/mod_cache.html.en | 2 +-
docs/manual/mod/mod_cache.html.fr | 8 +-
docs/manual/mod/mod_cache_socache.html | 4 +
docs/manual/mod/mod_cache_socache.html.en | 6 +-
docs/manual/mod/mod_cache_socache.html.fr | 291 +++++++++
docs/manual/mod/mod_deflate.html.fr | 4 +-
docs/manual/mod/mod_env.html.en | 7 +-
docs/manual/mod/mod_env.html.fr | 14 +-
docs/manual/mod/mod_env.html.tr.utf8 | 4 +-
docs/manual/mod/mod_filter.html.en | 13 +-
docs/manual/mod/mod_filter.html.fr | 30 +-
docs/manual/mod/mod_headers.html.en | 24 +-
docs/manual/mod/mod_headers.html.fr | 27 +-
docs/manual/mod/mod_ldap.html.en | 35 +-
docs/manual/mod/mod_ldap.html.fr | 41 +-
docs/manual/mod/mod_log_config.html.en | 9 +-
docs/manual/mod/mod_log_config.html.fr | 104 ++-
docs/manual/mod/mod_log_config.html.tr.utf8 | 4 +-
docs/manual/mod/mod_log_debug.html.en | 2 +-
docs/manual/mod/mod_logio.html.en | 7 +-
docs/manual/mod/mod_logio.html.fr | 8 +-
docs/manual/mod/mod_logio.html.tr.utf8 | 1 +
docs/manual/mod/mod_lua.html.en | 113 +++-
docs/manual/mod/mod_lua.html.fr | 246 ++++++-
docs/manual/mod/mod_macro.html.en | 229 ++++---
docs/manual/mod/mod_macro.html.fr | 233 ++++---
docs/manual/mod/mod_mime.html.fr | 6 +-
docs/manual/mod/mod_negotiation.html.en | 13 +-
docs/manual/mod/mod_negotiation.html.fr | 12 +-
docs/manual/mod/mod_proxy.html.en | 39 +-
docs/manual/mod/mod_proxy.html.fr | 42 +-
docs/manual/mod/mod_proxy_express.html.en | 1 +
docs/manual/mod/mod_proxy_express.html.fr | 5 +-
docs/manual/mod/mod_proxy_fcgi.html.en | 6 +-
docs/manual/mod/mod_proxy_fcgi.html.fr | 12 +-
docs/manual/mod/mod_proxy_html.html.en | 16 +-
docs/manual/mod/mod_proxy_html.html.fr | 73 ++-
docs/manual/mod/mod_proxy_http.html.en | 3 +-
docs/manual/mod/mod_proxy_http.html.fr | 6 +-
docs/manual/mod/mod_session_crypto.html.en | 13 +
docs/manual/mod/mod_session_crypto.html.fr | 14 +
docs/manual/mod/mod_setenvif.html.tr.utf8 | 1 -
docs/manual/mod/mod_ssl.html.en | 69 +-
docs/manual/mod/mod_ssl.html.fr | 242 +++++--
docs/manual/mod/mpm_common.html.fr | 4 +-
docs/manual/mod/prefork.html.fr | 8 +-
docs/manual/mod/quickreference.html.de | 599 ++++++++---------
docs/manual/mod/quickreference.html.en | 601 ++++++++---------
docs/manual/mod/quickreference.html.es | 601 ++++++++---------
docs/manual/mod/quickreference.html.fr | 660 +++++++++----------
docs/manual/mod/quickreference.html.ja.utf8 | 595 ++++++++---------
docs/manual/mod/quickreference.html.ko.euc-kr | 599 ++++++++---------
docs/manual/mod/quickreference.html.tr.utf8 | 603 ++++++++---------
docs/manual/mod/quickreference.html.zh-cn | 601 ++++++++---------
docs/manual/new_features_2_4.html.en | 8 +-
docs/manual/new_features_2_4.html.fr | 6 +-
docs/manual/new_features_2_4.html.tr.utf8 | 1 +
docs/manual/platform/win_compiling.html.en | 2 +-
docs/manual/platform/windows.html.en | 4 +-
docs/manual/platform/windows.html.fr | 2 +
docs/manual/programs/ab.html.en | 6 +
docs/manual/programs/ab.html.fr | 8 +-
docs/manual/programs/ab.html.tr.utf8 | 1 +
docs/manual/programs/apxs.html.tr.utf8 | 7 +-
docs/manual/programs/fcgistarter.html.tr.utf8 | 2 -
docs/manual/programs/htpasswd.html.tr.utf8 | 19 +-
docs/manual/programs/rotatelogs.html.tr.utf8 | 7 +-
docs/manual/programs/suexec.html.tr.utf8 | 1 -
docs/manual/ssl/ssl_faq.html.en | 33 +
docs/manual/ssl/ssl_faq.html.fr | 41 ++
docs/manual/ssl/ssl_intro.html.en | 14 +-
docs/manual/ssl/ssl_intro.html.fr | 16 +-
docs/manual/stopping.html.fr | 3 +-
docs/manual/style/version.ent | 2 +-
docs/manual/upgrading.html.en | 21 +-
docs/manual/upgrading.html.fr | 38 +-
docs/manual/urlmapping.html.tr.utf8 | 19 +-
docs/manual/vhosts/name-based.html.fr | 2 +-
docs/manual/vhosts/name-based.html.tr.utf8 | 14 +-
httpd.spec | 3 +-
include/ap_expr.h | 2 +-
include/ap_mmn.h | 6 +-
include/ap_release.h | 2 +-
include/ap_slotmem.h | 1 +
include/http_config.h | 29 +-
include/http_protocol.h | 2 +-
include/httpd.h | 8 +
include/mpm_common.h | 44 ++
include/util_fcgi.h | 280 ++++++++
include/util_ldap.h | 4 +
libhttpd.dsp | 8 +
modules/aaa/mod_auth_basic.c | 62 +-
modules/aaa/mod_auth_digest.c | 10 +-
modules/aaa/mod_authn_socache.c | 32 +-
modules/aaa/mod_authnz_ldap.c | 2 +-
modules/aaa/mod_authz_groupfile.c | 2 +-
modules/aaa/mod_authz_user.c | 2 +-
modules/cache/cache_storage.c | 9 +-
modules/cache/mod_cache.c | 8 +-
modules/cache/mod_cache_socache.c | 4 +-
modules/cache/mod_socache_memcache.c | 2 +-
modules/cache/mod_socache_shmcb.c | 8 +-
modules/dav/fs/repos.c | 29 +-
modules/dav/main/mod_dav.c | 23 +-
modules/dav/main/mod_dav.h | 5 +-
modules/dav/main/util.c | 7 +-
modules/filters/mod_charset_lite.c | 2 +-
modules/filters/mod_data.c | 3 +-
modules/filters/mod_deflate.c | 20 +-
modules/filters/mod_filter.c | 3 +
modules/filters/mod_proxy_html.dsp | 2 +-
modules/filters/mod_xml2enc.dsp | 2 +-
modules/generators/mod_info.c | 2 +-
modules/http/http_filters.c | 20 +-
modules/ldap/util_ldap.c | 47 +-
modules/ldap/util_ldap_cache.c | 2 +-
modules/loggers/mod_log_config.c | 14 +-
modules/loggers/mod_logio.c | 19 +-
modules/lua/lua_passwd.h | 1 -
modules/lua/lua_request.c | 434 ++++++++++++-
modules/lua/mod_lua.c | 89 ++-
modules/lua/mod_lua.dsp | 8 +-
modules/mappers/mod_rewrite.c | 12 +
modules/metadata/mod_headers.c | 52 +-
modules/metadata/mod_mime_magic.c | 2 +-
modules/proxy/ajp.h | 2 +-
modules/proxy/fcgi_protocol.h | 108 ----
modules/proxy/mod_proxy.c | 42 +-
modules/proxy/mod_proxy.h | 12 +-
modules/proxy/mod_proxy_balancer.c | 9 +-
modules/proxy/mod_proxy_connect.c | 2 +-
modules/proxy/mod_proxy_fcgi.c | 446 ++++---------
modules/proxy/mod_proxy_http.c | 2 +-
modules/proxy/proxy_util.c | 66 +-
modules/session/mod_session.c | 15 +-
modules/session/mod_session_crypto.c | 32 +-
modules/slotmem/mod_slotmem_shm.c | 73 ++-
modules/ssl/config.m4 | 1 -
modules/ssl/mod_ssl.c | 13 +-
modules/ssl/mod_ssl.dsp | 4 -
modules/ssl/ssl_engine_config.c | 24 +-
modules/ssl/ssl_engine_dh.c | 244 -------
modules/ssl/ssl_engine_init.c | 280 ++------
modules/ssl/ssl_engine_io.c | 22 +-
modules/ssl/ssl_engine_kernel.c | 173 ++---
modules/ssl/ssl_engine_pphrase.c | 6 +-
modules/ssl/ssl_engine_vars.c | 8 +-
modules/ssl/ssl_private.h | 138 ++--
modules/ssl/ssl_scache.c | 2 +-
modules/ssl/ssl_util.c | 6 +-
modules/ssl/ssl_util_ssl.c | 32 +
modules/test/mod_optional_hook_export.h | 2 +-
os/win32/BaseAddr.ref | 231 +++----
server/Makefile.in | 3 +-
server/config.c | 32 +-
server/core.c | 1 +
server/core_filters.c | 10 +-
server/log.c | 13 +-
server/mpm/config.m4 | 11 +
server/mpm/event/config.m4 | 2 +
server/mpm/event/config3.m4 | 2 +-
server/mpm/event/event.c | 177 ++---
server/mpm/event/pod.c | 113 ----
server/mpm/event/pod.h | 59 --
server/mpm/winnt/child.c | 105 ++-
server/mpm/winnt/mpm_winnt.c | 2 +-
server/mpm/winnt/mpm_winnt.h | 2 +-
server/mpm/worker/config3.m4 | 2 +-
server/mpm/worker/pod.c | 113 ----
server/mpm/worker/pod.h | 58 --
server/mpm/worker/worker.c | 45 +-
server/mpm_common.c | 2 +
server/mpm_unix.c | 101 +++
server/scoreboard.c | 2 +-
server/util_fcgi.c | 287 +++++++++
server/util_script.c | 14 +-
server/vhost.c | 16 +-
support/ab.c | 69 +-
support/fcgistarter.c | 5 +
support/htdbm.c | 2 +-
support/rotatelogs.c | 77 +--
250 files changed, 9400 insertions(+), 5123 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git
More information about the Pkg-apache-commits
mailing list