[apache2] 02/05: Merge branch 'upstream'
Stefan Fritsch
sf at moszumanska.debian.org
Wed Dec 21 23:09:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
sf pushed a commit to branch master
in repository apache2.
commit 535f79e78413eea66863700fcc8f768cd5983cc9
Merge: adb6f18 4e95102
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Wed Dec 21 23:06:36 2016 +0100
Merge branch 'upstream'
Apache-apr2.dsw | 25 +
Apache.dsw | 27 +
CHANGES | 284 +++++++-
CMakeLists.txt | 35 +-
Makefile.win | 2 +
acinclude.m4 | 9 +-
build/installwinconf.awk | 1 +
configure | 325 +++++++--
configure.in | 27 +-
docs/conf/httpd.conf.in | 9 +
docs/conf/mime.types | 293 +++++++-
docs/manual/caching.html.en | 49 +-
docs/manual/caching.html.fr | 50 +-
docs/manual/caching.html.tr.utf8 | 50 +-
docs/manual/convenience.map | 5 +
docs/manual/custom-error.html.tr.utf8 | 1 -
docs/manual/expr.html.en | 60 +-
docs/manual/expr.html.fr | 53 +-
docs/manual/howto/auth.html.tr.utf8 | 13 +-
docs/manual/howto/cgi.html.en | 15 +-
docs/manual/howto/cgi.html.fr | 12 +-
docs/manual/howto/public_html.html.tr.utf8 | 15 +-
docs/manual/install.html.en | 2 +-
docs/manual/install.html.fr | 2 +-
docs/manual/install.html.tr.utf8 | 4 +-
docs/manual/logs.html.tr.utf8 | 5 +-
docs/manual/mod/core.html.de | 27 +
docs/manual/mod/core.html.en | 129 +++-
docs/manual/mod/core.html.es | 29 +
docs/manual/mod/core.html.fr | 84 ++-
docs/manual/mod/core.html.ja.utf8 | 27 +
docs/manual/mod/core.html.tr.utf8 | 207 ++++--
docs/manual/mod/directives.html.de | 7 +-
docs/manual/mod/directives.html.en | 7 +-
docs/manual/mod/directives.html.es | 7 +-
docs/manual/mod/directives.html.fr | 7 +-
docs/manual/mod/directives.html.ja.utf8 | 7 +-
docs/manual/mod/directives.html.ko.euc-kr | 7 +-
docs/manual/mod/directives.html.tr.utf8 | 7 +-
docs/manual/mod/directives.html.zh-cn.utf8 | 7 +-
docs/manual/mod/event.html.en | 69 +-
docs/manual/mod/event.html.fr | 2 +
docs/manual/mod/mod_alias.html.en | 23 +-
docs/manual/mod/mod_alias.html.fr | 32 +-
docs/manual/mod/mod_authz_groupfile.html.fr | 4 +-
docs/manual/mod/mod_autoindex.html.tr.utf8 | 1 -
docs/manual/mod/mod_dbd.html.en | 23 +
docs/manual/mod/mod_dbd.html.fr | 23 +
docs/manual/mod/mod_dir.html.en | 2 +-
docs/manual/mod/mod_dir.html.fr | 12 +-
docs/manual/mod/mod_dir.html.tr.utf8 | 2 +-
docs/manual/mod/mod_headers.html.en | 12 +-
docs/manual/mod/mod_headers.html.fr | 11 +-
docs/manual/mod/mod_http2.html.en | 95 +++
docs/manual/mod/mod_log_config.html.tr.utf8 | 1 -
docs/manual/mod/mod_negotiation.html.fr | 2 -
docs/manual/mod/mod_proxy.html.en | 7 +-
docs/manual/mod/mod_proxy.html.fr | 25 +-
docs/manual/mod/mod_proxy_express.html.en | 2 +-
docs/manual/mod/mod_proxy_express.html.fr | 2 +
docs/manual/mod/mod_proxy_html.html.en | 38 +-
docs/manual/mod/mod_proxy_html.html.fr | 50 +-
docs/manual/mod/mod_proxy_http2.html.en | 15 +
docs/manual/mod/mod_ratelimit.html.en | 16 +-
docs/manual/mod/mod_ratelimit.html.fr | 2 +
docs/manual/mod/mod_rewrite.html.en | 72 +-
docs/manual/mod/mod_rewrite.html.fr | 194 ++---
docs/manual/mod/mod_setenvif.html.fr | 10 +-
docs/manual/mod/mod_ssl.html.en | 20 +-
docs/manual/mod/mod_ssl.html.fr | 25 +-
docs/manual/mod/mod_substitute.html.fr | 9 +-
docs/manual/mod/mod_userdir.html.tr.utf8 | 8 +-
docs/manual/mod/mpm_common.html.de | 2 +-
docs/manual/mod/mpm_common.html.en | 36 +-
docs/manual/mod/mpm_common.html.fr | 17 +-
docs/manual/mod/mpm_common.html.ja.utf8 | 2 +-
docs/manual/mod/mpm_common.html.tr.utf8 | 35 +-
docs/manual/mod/quickreference.html.de | 474 +++++++------
docs/manual/mod/quickreference.html.en | 472 +++++++------
docs/manual/mod/quickreference.html.es | 478 ++++++-------
docs/manual/mod/quickreference.html.fr | 488 ++++++-------
docs/manual/mod/quickreference.html.ja.utf8 | 468 ++++++------
docs/manual/mod/quickreference.html.ko.euc-kr | 468 ++++++------
docs/manual/mod/quickreference.html.tr.utf8 | 484 ++++++-------
docs/manual/mod/quickreference.html.zh-cn.utf8 | 472 +++++++------
docs/manual/programs/configure.html.fr | 16 +-
docs/manual/programs/configure.html.tr.utf8 | 11 +-
docs/manual/rewrite/flags.html.en | 3 +
docs/manual/rewrite/flags.html.fr | 3 +
docs/manual/rewrite/vhosts.html.en | 2 +-
docs/manual/rewrite/vhosts.html.fr | 2 +-
docs/manual/sections.html.en | 2 +-
docs/manual/sections.html.fr | 2 +-
docs/manual/ssl/ssl_faq.html.fr | 22 +-
docs/manual/ssl/ssl_howto.html.fr | 6 +-
docs/manual/style/version.ent | 2 +-
docs/manual/upgrading.html.en | 64 +-
docs/manual/upgrading.html.fr | 2 +
docs/manual/urlmapping.html.tr.utf8 | 1 -
docs/manual/vhosts/examples.html.tr.utf8 | 42 +-
docs/manual/vhosts/index.html.en | 15 +-
docs/manual/vhosts/index.html.fr | 12 +-
docs/manual/vhosts/index.html.tr.utf8 | 10 +-
docs/manual/vhosts/index.html.zh-cn.utf8 | 1 +
httpd.spec | 2 +-
include/ap_config_auto.h.in | 4 +
include/ap_mmn.h | 19 +-
include/ap_release.h | 2 +-
include/http_config.h | 23 +-
include/http_core.h | 18 +-
include/http_log.h | 2 +-
include/http_protocol.h | 17 +-
include/http_request.h | 17 +-
include/httpd.h | 26 +-
include/scoreboard.h | 2 +-
include/util_ldap.h | 2 +-
modules/NWGNUmakefile | 2 +-
modules/aaa/mod_allowmethods.c | 2 +-
modules/aaa/mod_auth_basic.c | 2 +-
modules/aaa/mod_auth_digest.c | 56 +-
modules/aaa/mod_auth_form.c | 2 +-
modules/aaa/mod_authn_dbd.c | 5 -
modules/aaa/mod_authz_core.c | 2 +-
modules/aaa/mod_authz_groupfile.c | 2 +-
modules/arch/netware/mod_nw_ssl.c | 2 +-
modules/arch/win32/mod_isapi.c | 6 +-
modules/arch/win32/mod_isapi.h | 2 +-
modules/cache/NWGNUsocachmem | 1 +
modules/cache/cache_storage.c | 50 +-
modules/cache/cache_util.c | 107 ++-
modules/cache/cache_util.h | 2 +-
modules/cache/mod_cache.c | 91 ++-
modules/cache/mod_cache_disk.c | 17 +-
modules/cache/mod_file_cache.c | 6 +-
modules/cache/mod_socache_memcache.c | 66 +-
modules/cache/mod_socache_memcache.dsp | 4 +-
modules/cluster/README.heartbeat | 2 +-
modules/core/mod_macro.c | 6 +-
modules/core/mod_so.c | 4 +-
modules/dav/main/mod_dav.c | 93 ++-
modules/dav/main/mod_dav.h | 69 +-
modules/dav/main/util.c | 4 +-
modules/examples/README | 2 +-
modules/filters/mod_include.c | 14 +-
modules/filters/mod_ratelimit.c | 56 +-
modules/filters/mod_reqtimeout.c | 10 +-
modules/filters/regexp.c | 2 +-
modules/generators/mod_cgid.c | 67 +-
modules/generators/mod_status.c | 55 +-
modules/http/http_core.c | 2 +-
modules/http/http_filters.c | 206 ++++--
modules/http/http_protocol.c | 5 +-
modules/http/http_request.c | 91 ++-
modules/http2/NWGNUmod_http2 | 22 +-
modules/http2/NWGNUproxyht2 | 1 +
modules/http2/README.h2 | 2 +-
modules/http2/config2.m4 | 5 +-
modules/http2/h2.h | 46 +-
modules/http2/h2_alt_svc.c | 2 +-
modules/http2/h2_bucket_beam.c | 446 ++++++++----
modules/http2/h2_bucket_beam.h | 88 ++-
modules/http2/h2_config.c | 130 +++-
modules/http2/h2_config.h | 16 +-
modules/http2/h2_conn.c | 32 +-
modules/http2/h2_conn.h | 7 +-
modules/http2/h2_conn_io.c | 51 +-
modules/http2/h2_ctx.c | 4 +-
modules/http2/h2_filter.c | 389 ++++++++--
modules/http2/h2_filter.h | 30 +-
modules/http2/h2_from_h1.c | 784 ++++++++++++++-------
modules/http2/h2_from_h1.h | 48 +-
modules/http2/h2_h2.c | 84 ++-
modules/http2/h2_h2.h | 4 +-
modules/http2/h2_headers.c | 161 +++++
modules/http2/h2_headers.h | 70 ++
modules/http2/h2_mplx.c | 631 ++++++++---------
modules/http2/h2_mplx.h | 50 +-
modules/http2/h2_ngn_shed.c | 78 +-
modules/http2/h2_ngn_shed.h | 24 +-
modules/http2/h2_proxy_session.c | 370 +++++++---
modules/http2/h2_proxy_session.h | 16 +-
modules/http2/h2_proxy_util.c | 494 +++++++++++--
modules/http2/h2_proxy_util.h | 103 +--
modules/http2/h2_push.c | 69 +-
modules/http2/h2_push.h | 16 +-
modules/http2/h2_request.c | 195 +++--
modules/http2/h2_request.h | 7 +-
modules/http2/h2_response.c | 205 ------
modules/http2/h2_response.h | 73 --
modules/http2/h2_session.c | 578 ++++++++-------
modules/http2/h2_session.h | 16 +-
modules/http2/h2_stream.c | 629 ++++++++++-------
modules/http2/h2_stream.h | 111 ++-
modules/http2/h2_stream_set.c | 145 ----
modules/http2/h2_stream_set.h | 51 --
modules/http2/h2_switch.h | 2 +-
modules/http2/h2_task.c | 645 +++++++----------
modules/http2/h2_task.h | 45 +-
modules/http2/h2_util.c | 139 ++--
modules/http2/h2_util.h | 69 +-
modules/http2/h2_version.h | 4 +-
modules/http2/h2_worker.c | 2 +-
modules/http2/h2_workers.c | 4 +-
modules/http2/mod_http2.c | 38 +-
modules/http2/mod_http2.dep | 61 --
modules/http2/mod_http2.dsp | 2 +-
modules/http2/mod_http2.h | 12 +-
modules/http2/mod_http2.mak | 18 +-
modules/http2/mod_proxy_http2.c | 128 ++--
modules/ldap/util_ldap_cache_mgr.c | 2 +-
modules/loggers/mod_log_config.c | 2 +-
modules/lua/mod_lua.c | 3 +-
modules/mappers/mod_actions.c | 2 +-
modules/mappers/mod_negotiation.c | 6 +-
modules/mappers/mod_rewrite.c | 17 +-
modules/metadata/mod_env.c | 2 +-
modules/metadata/mod_headers.c | 11 +-
modules/metadata/mod_mime_magic.c | 2 +-
modules/metadata/mod_remoteip.c | 2 +-
modules/metadata/mod_version.c | 2 +-
modules/proxy/NWGNUproxy | 3 +
.../NWGNUsocachmem => proxy/NWGNUproxyhcheck} | 62 +-
modules/proxy/config.m4 | 2 +-
modules/proxy/mod_proxy.c | 62 +-
modules/proxy/mod_proxy.h | 33 +-
modules/proxy/mod_proxy_ajp.c | 9 +-
modules/proxy/mod_proxy_balancer.c | 14 +-
modules/proxy/mod_proxy_connect.c | 11 +-
modules/proxy/mod_proxy_fcgi.c | 37 +-
modules/proxy/mod_proxy_hcheck.c | 4 +-
modules/proxy/mod_proxy_hcheck.dep | 5 +
modules/proxy/mod_proxy_hcheck.dsp | 123 ++++
modules/proxy/mod_proxy_hcheck.mak | 380 ++++++++++
modules/proxy/mod_proxy_http.c | 19 +-
modules/proxy/proxy_util.c | 158 +++--
modules/session/mod_session.c | 13 +-
modules/session/mod_session_crypto.c | 228 +++++-
modules/slotmem/mod_slotmem_shm.c | 2 +-
modules/ssl/README | 4 +-
modules/ssl/ssl_engine_init.c | 2 +-
modules/ssl/ssl_engine_io.c | 17 +-
modules/ssl/ssl_engine_kernel.c | 20 +-
modules/ssl/ssl_engine_vars.c | 2 +-
modules/ssl/ssl_private.h | 2 +-
os/bs2000/ebcdic.c | 2 +-
os/netware/pre_nw.h | 2 +-
os/win32/BaseAddr.ref | 1 +
os/win32/ap_regkey.c | 2 +-
server/config.c | 6 +-
server/core.c | 72 +-
server/gen_test_char.c | 47 +-
server/listen.c | 2 +-
server/mpm/event/event.c | 391 +++++-----
server/mpm/event/fdqueue.c | 30 +-
server/mpm/event/fdqueue.h | 2 +
server/mpm/prefork/prefork.c | 2 +-
server/mpm/winnt/child.c | 113 +--
server/mpm/winnt/mpm_winnt.c | 6 +-
server/mpm/winnt/mpm_winnt.h | 3 -
server/mpm/winnt/service.c | 2 +-
server/mpm/worker/worker.c | 4 +-
server/mpm_unix.c | 36 +-
server/protocol.c | 696 ++++++++++++------
server/request.c | 14 +-
server/scoreboard.c | 2 +-
server/util.c | 35 +-
server/util_cookies.c | 6 +-
server/util_script.c | 8 +
server/vhost.c | 292 ++++++--
support/ab.c | 62 +-
support/checkgid.c | 2 +-
support/htcacheclean.c | 4 +-
support/logresolve.c | 2 +-
support/logresolve.pl.in | 4 +-
test/make_sni.sh | 2 +-
275 files changed, 11787 insertions(+), 6884 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