[apache2] 02/04: Merge branch 'upstream'
Stefan Fritsch
sf at moszumanska.debian.org
Sat Dec 19 11:53:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
sf pushed a commit to branch master
in repository apache2.
commit 3145d057ee2fbf0fcb14d2631035ac9ae2af27ab
Merge: 679214b d532578
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Sat Dec 19 09:18:52 2015 +0100
Merge branch 'upstream'
CHANGES | 97 ++
CMakeLists.txt | 15 +-
INSTALL | 17 -
build/ltmain.sh | 4 +-
configure | 70 +-
docs/conf/httpd.conf.in | 11 -
docs/manual/convenience.map | 7 +
docs/manual/mod/core.html.de | 17 +
docs/manual/mod/core.html.en | 25 +
docs/manual/mod/core.html.es | 17 +
docs/manual/mod/core.html.fr | 28 +
docs/manual/mod/core.html.ja.utf8 | 17 +
docs/manual/mod/core.html.tr.utf8 | 17 +
docs/manual/mod/directives.html.de | 9 +-
docs/manual/mod/directives.html.en | 9 +-
docs/manual/mod/directives.html.es | 9 +-
docs/manual/mod/directives.html.fr | 9 +-
docs/manual/mod/directives.html.ja.utf8 | 9 +-
docs/manual/mod/directives.html.ko.euc-kr | 9 +-
docs/manual/mod/directives.html.tr.utf8 | 9 +-
docs/manual/mod/directives.html.zh-cn.utf8 | 9 +-
docs/manual/mod/mod_allowmethods.html.en | 12 +-
docs/manual/mod/mod_http2.html.en | 402 ++++++-
docs/manual/mod/mod_proxy.html.en | 5 +
docs/manual/mod/mod_proxy.html.fr | 2 +
docs/manual/mod/mod_proxy_fdpass.html.en | 11 +-
docs/manual/mod/mod_proxy_fdpass.html.fr | 2 +
docs/manual/mod/mod_rewrite.html.fr | 7 +-
docs/manual/mod/mod_ssl.html.en | 32 +-
docs/manual/mod/mod_ssl.html.fr | 39 +-
docs/manual/mod/mod_substitute.html.fr | 27 +-
docs/manual/mod/mpm_common.html.fr | 56 +-
docs/manual/mod/quickreference.html.de | 468 ++++----
docs/manual/mod/quickreference.html.en | 466 ++++----
docs/manual/mod/quickreference.html.es | 466 ++++----
docs/manual/mod/quickreference.html.fr | 474 ++++----
docs/manual/mod/quickreference.html.ja.utf8 | 462 ++++----
docs/manual/mod/quickreference.html.ko.euc-kr | 462 ++++----
docs/manual/mod/quickreference.html.tr.utf8 | 470 ++++----
docs/manual/mod/quickreference.html.zh-cn.utf8 | 466 ++++----
docs/manual/style/version.ent | 2 +-
httpd.spec | 2 +-
include/ap_config_auto.h.in | 7 +
include/ap_mmn.h | 3 +-
include/ap_release.h | 2 +-
include/http_core.h | 13 +
include/http_protocol.h | 71 +-
include/httpd.h | 7 +
modules/aaa/mod_auth_basic.c | 6 +-
modules/aaa/mod_authn_anon.c | 4 +-
modules/aaa/mod_authnz_ldap.c | 4 +-
modules/arch/win32/mod_isapi.c | 3 +-
modules/cache/cache_util.h | 2 +-
modules/http/http_request.c | 88 +-
modules/http2/config.m4 | 14 +-
modules/http2/h2_alt_svc.c | 2 +-
modules/http2/h2_bucket_eoc.c | 109 ++
modules/http2/h2_bucket_eoc.h | 31 +
modules/http2/h2_bucket_eos.c | 109 ++
modules/http2/h2_bucket_eos.h | 30 +
modules/http2/h2_config.c | 268 ++++-
modules/http2/h2_config.h | 28 +-
modules/http2/h2_conn.c | 321 +-----
modules/http2/h2_conn.h | 23 +-
modules/http2/h2_conn_io.c | 225 ++--
modules/http2/h2_conn_io.h | 26 +-
modules/http2/h2_ctx.c | 10 +-
modules/http2/h2_ctx.h | 18 +-
modules/http2/h2_from_h1.c | 71 +-
modules/http2/h2_from_h1.h | 16 +-
modules/http2/h2_h2.c | 563 +++++++++-
modules/http2/h2_h2.h | 74 +-
modules/http2/h2_io.c | 180 ++-
modules/http2/h2_io.h | 53 +-
modules/http2/h2_io_set.c | 63 +-
modules/http2/h2_io_set.h | 19 +-
modules/http2/h2_mplx.c | 554 ++++++----
modules/http2/h2_mplx.h | 107 +-
modules/http2/h2_push.c | 395 +++++++
modules/http2/h2_push.h | 31 +
modules/http2/h2_request.c | 417 +++++--
modules/http2/h2_request.h | 61 +-
modules/http2/h2_response.c | 242 ++---
modules/http2/h2_response.h | 65 +-
modules/http2/h2_session.c | 1388 ++++++++++++++++--------
modules/http2/h2_session.h | 88 +-
modules/http2/h2_stream.c | 641 +++++++++--
modules/http2/h2_stream.h | 252 ++++-
modules/http2/h2_stream_set.c | 177 ++-
modules/http2/h2_stream_set.h | 17 +-
modules/http2/h2_switch.c | 31 +-
modules/http2/h2_task.c | 358 ++----
modules/http2/h2_task.h | 123 +--
modules/http2/h2_task_input.c | 75 +-
modules/http2/h2_task_input.h | 6 +-
modules/http2/h2_task_output.c | 50 +-
modules/http2/h2_task_output.h | 8 +-
modules/http2/h2_task_queue.c | 153 ++-
modules/http2/h2_task_queue.h | 141 +--
modules/http2/h2_to_h1.c | 305 ------
modules/http2/h2_to_h1.h | 87 --
modules/http2/h2_util.c | 382 ++++++-
modules/http2/h2_util.h | 75 +-
modules/http2/h2_version.h | 4 +-
modules/http2/h2_worker.c | 68 +-
modules/http2/h2_worker.h | 14 +-
modules/http2/h2_workers.c | 78 +-
modules/http2/h2_workers.h | 1 +
modules/http2/mod_http2.dsp | 16 +-
modules/proxy/mod_proxy.c | 2 +-
modules/proxy/mod_proxy_fdpass.c | 6 +-
modules/ssl/mod_ssl.c | 30 +-
modules/ssl/ssl_engine_config.c | 6 +-
modules/ssl/ssl_engine_io.c | 174 ++-
modules/ssl/ssl_engine_kernel.c | 216 +++-
modules/ssl/ssl_engine_vars.c | 62 +-
modules/ssl/ssl_private.h | 3 +
modules/ssl/ssl_util_stapling.c | 71 +-
server/core.c | 46 +-
server/protocol.c | 83 +-
server/scoreboard.c | 25 +-
server/util_script.c | 31 +-
122 files changed, 9335 insertions(+), 5040 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