[apache2] 01/03: Merge branch 'upstream'
Stefan Fritsch
sf at moszumanska.debian.org
Sat Oct 24 09:16:05 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 9b528e8aa0298ecbc05c61639201f50a9acb8de1
Merge: 373ad9a f775596
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Sat Oct 24 10:38:15 2015 +0200
Merge branch 'upstream'
Apache-apr2.dsw | 18 +
Apache.dsw | 21 +
BuildBin.dsp | 4 +-
CHANGES | 89 +-
CMakeLists.txt | 39 +
Makefile.win | 77 ++
README.cmake | 21 +-
acinclude.m4 | 36 +-
build/NWGNUenvironment.inc | 6 +
build/installwinconf.awk | 1 +
configure | 1393 +++++++++++++++-----
configure.in | 2 +-
docs/manual/convenience.map | 14 +
docs/manual/developer/thread_safety.html.en | 2 +-
docs/manual/expr.html.fr | 4 +-
docs/manual/getting-started.html.en | 2 +-
docs/manual/install.html.tr.utf8 | 9 +-
docs/manual/invoking.html.fr | 12 +-
docs/manual/mod/core.html.de | 36 +
docs/manual/mod/core.html.en | 75 ++
docs/manual/mod/core.html.es | 36 +
docs/manual/mod/core.html.fr | 87 ++
docs/manual/mod/core.html.ja.utf8 | 36 +
docs/manual/mod/core.html.tr.utf8 | 117 +-
docs/manual/mod/directives.html.de | 16 +-
docs/manual/mod/directives.html.en | 16 +-
docs/manual/mod/directives.html.es | 16 +-
docs/manual/mod/directives.html.fr | 16 +-
docs/manual/mod/directives.html.ja.utf8 | 16 +-
docs/manual/mod/directives.html.ko.euc-kr | 16 +-
docs/manual/mod/directives.html.tr.utf8 | 16 +-
docs/manual/mod/directives.html.zh-cn.utf8 | 16 +-
docs/manual/mod/index.html.de | 1 +
docs/manual/mod/index.html.en | 1 +
docs/manual/mod/index.html.es | 1 +
docs/manual/mod/index.html.fr | 1 +
docs/manual/mod/index.html.ja.utf8 | 1 +
docs/manual/mod/index.html.ko.euc-kr | 1 +
docs/manual/mod/index.html.tr.utf8 | 1 +
docs/manual/mod/index.html.zh-cn.utf8 | 1 +
docs/manual/mod/mod_alias.html.fr | 84 +-
docs/manual/mod/mod_alias.html.tr.utf8 | 89 +-
docs/manual/mod/mod_auth_form.html.en | 2 +-
docs/manual/mod/mod_authz_host.html.en | 4 +-
docs/manual/mod/mod_authz_host.html.fr | 4 +-
docs/manual/mod/mod_autoindex.html.tr.utf8 | 31 +-
docs/manual/mod/mod_dir.html.tr.utf8 | 11 +-
docs/manual/mod/mod_http2.html | 5 +
docs/manual/mod/mod_http2.html.en | 293 ++++
docs/manual/mod/mod_info.html.en | 6 +-
docs/manual/mod/mod_info.html.fr | 6 +-
docs/manual/mod/mod_log_config.html.tr.utf8 | 47 +-
docs/manual/mod/mod_logio.html.tr.utf8 | 16 +-
docs/manual/mod/mod_lua.html.en | 2 +-
docs/manual/mod/mod_lua.html.fr | 2 +-
docs/manual/mod/mod_proxy.html.en | 243 ++--
docs/manual/mod/mod_proxy.html.fr | 62 +-
docs/manual/mod/mod_proxy.html.ja.utf8 | 2 +-
docs/manual/mod/mod_rewrite.html.en | 6 +-
docs/manual/mod/mod_rewrite.html.fr | 2 +
docs/manual/mod/mod_socache_memcache.html.en | 39 +-
docs/manual/mod/mod_socache_memcache.html.fr | 43 +-
docs/manual/mod/mod_ssl.html.en | 24 +-
docs/manual/mod/mod_ssl.html.fr | 30 +-
docs/manual/mod/mod_status.html.tr.utf8 | 3 +-
docs/manual/mod/mod_substitute.html.en | 22 +
docs/manual/mod/mod_substitute.html.fr | 17 +
docs/manual/mod/mod_vhost_alias.html.tr.utf8 | 19 +-
docs/manual/mod/mpm_common.html.de | 27 +-
docs/manual/mod/mpm_common.html.en | 114 +-
docs/manual/mod/mpm_common.html.fr | 46 +
docs/manual/mod/mpm_common.html.ja.utf8 | 23 +-
docs/manual/mod/mpm_common.html.tr.utf8 | 38 +
docs/manual/mod/mpmt_os2.html.en | 2 +-
docs/manual/mod/quickreference.html.de | 695 +++++-----
docs/manual/mod/quickreference.html.en | 693 +++++-----
docs/manual/mod/quickreference.html.es | 693 +++++-----
docs/manual/mod/quickreference.html.fr | 718 +++++-----
docs/manual/mod/quickreference.html.ja.utf8 | 679 +++++-----
docs/manual/mod/quickreference.html.ko.euc-kr | 691 +++++-----
docs/manual/mod/quickreference.html.tr.utf8 | 704 +++++-----
docs/manual/mod/quickreference.html.zh-cn.utf8 | 693 +++++-----
docs/manual/new_features_2_4.html.tr.utf8 | 6 +-
docs/manual/programs/ab.html.tr.utf8 | 1 -
docs/manual/rewrite/flags.html.en | 9 +
docs/manual/rewrite/flags.html.fr | 9 +
docs/manual/sitemap.html.de | 1 +
docs/manual/sitemap.html.en | 1 +
docs/manual/sitemap.html.es | 1 +
docs/manual/sitemap.html.fr | 1 +
docs/manual/sitemap.html.ja.utf8 | 1 +
docs/manual/sitemap.html.ko.euc-kr | 1 +
docs/manual/sitemap.html.tr.utf8 | 1 +
docs/manual/sitemap.html.zh-cn.utf8 | 1 +
docs/manual/ssl/ssl_howto.html.fr | 2 -
docs/manual/stopping.html.fr | 23 +-
docs/manual/style/version.ent | 2 +-
docs/manual/vhosts/examples.html.tr.utf8 | 77 +-
docs/manual/vhosts/ip-based.html.tr.utf8 | 13 +-
docs/manual/vhosts/mass.html.tr.utf8 | 45 +-
docs/manual/vhosts/name-based.html.tr.utf8 | 5 +-
httpd.spec | 2 +-
include/ap_config_auto.h.in | 9 +
include/ap_listen.h | 28 +
include/ap_mmn.h | 13 +-
include/ap_release.h | 2 +-
include/http_core.h | 4 +
include/http_log.h | 9 +-
include/http_protocol.h | 133 ++
include/http_request.h | 2 +-
include/httpd.h | 44 +-
include/scoreboard.h | 1 +
modules/NWGNUmakefile | 10 +-
modules/README | 3 +
modules/aaa/mod_authn_core.c | 4 +-
modules/aaa/mod_authz_core.c | 2 +-
modules/aaa/mod_authz_dbd.c | 13 +
modules/arch/netware/mod_netware.c | 6 +-
modules/arch/win32/mod_isapi.c | 2 +-
modules/cache/NWGNUcach_socache | 1 +
modules/cache/NWGNUsocachdbm | 1 +
modules/cache/NWGNUsocachshmcb | 1 +
modules/cache/cache_storage.c | 2 +-
modules/cache/cache_util.c | 1 -
modules/cache/cache_util.h | 2 +-
modules/cache/config.m4 | 2 +-
modules/cache/mod_cache.c | 1 +
modules/cache/mod_cache_disk.c | 14 +-
modules/cache/mod_cache_socache.c | 1 -
modules/cache/mod_socache_memcache.c | 59 +-
modules/core/mod_macro.c | 4 -
modules/core/test/Makefile | 2 -
modules/core/test/conf/test01.conf | 0
modules/core/test/conf/test02.conf | 0
modules/core/test/conf/test03.conf | 0
modules/core/test/conf/test04.conf | 0
modules/core/test/conf/test05.conf | 0
modules/core/test/conf/test06.conf | 0
modules/core/test/conf/test07.conf | 0
modules/core/test/conf/test08.conf | 0
modules/core/test/conf/test09.conf | 0
modules/core/test/conf/test10.conf | 0
modules/core/test/conf/test11.conf | 0
modules/core/test/conf/test12.conf | 0
modules/core/test/conf/test13.conf | 0
modules/core/test/conf/test14.conf | 0
modules/core/test/conf/test15.conf | 0
modules/core/test/conf/test16.conf | 0
modules/core/test/conf/test17.conf | 0
modules/core/test/conf/test18.conf | 0
modules/core/test/conf/test19.conf | 0
modules/core/test/conf/test20.conf | 0
modules/core/test/conf/test21.conf | 0
modules/core/test/conf/test22.conf | 0
modules/core/test/conf/test23.conf | 0
modules/core/test/conf/test24.conf | 0
modules/core/test/conf/test25.conf | 0
modules/core/test/conf/test26.conf | 0
modules/core/test/conf/test27.conf | 0
modules/core/test/conf/test28.conf | 0
modules/core/test/conf/test29.conf | 0
modules/core/test/conf/test30.conf | 0
modules/core/test/conf/test31.conf | 0
modules/core/test/conf/test32.conf | 0
modules/core/test/conf/test33.conf | 0
modules/core/test/conf/test34.conf | 0
modules/core/test/conf/test35.conf | 0
modules/core/test/conf/test36.conf | 0
modules/core/test/conf/test37.conf | 0
modules/core/test/conf/test38.conf | 0
modules/core/test/conf/test39.conf | 0
modules/core/test/conf/test40.conf | 0
modules/core/test/conf/test41.conf | 0
modules/core/test/conf/test42.conf | 0
modules/core/test/conf/test43.conf | 0
modules/core/test/conf/test44.conf | 0
modules/core/test/conf/test45.conf | 0
modules/core/test/conf/test46.conf | 0
modules/core/test/conf/test47.conf | 0
modules/core/test/conf/test48.conf | 0
modules/core/test/conf/test53.conf | 0
modules/dav/lock/locks.c | 8 +-
modules/dav/main/mod_dav.c | 2 +-
modules/dav/main/util.c | 3 +-
modules/examples/mod_case_filter_in.c | 2 +-
modules/filters/config.m4 | 2 +-
modules/filters/mod_buffer.c | 19 +-
modules/filters/mod_charset_lite.c | 2 +-
modules/filters/mod_deflate.c | 14 +-
modules/filters/mod_ext_filter.c | 2 +-
modules/filters/mod_filter.c | 2 +-
modules/filters/mod_include.c | 14 +-
modules/filters/mod_reqtimeout.c | 3 +-
modules/filters/mod_request.c | 3 +-
modules/filters/mod_sed.c | 4 +-
modules/filters/mod_substitute.c | 35 +-
modules/filters/mod_xml2enc.c | 2 +-
modules/generators/mod_autoindex.c | 9 +-
modules/http/http_protocol.c | 7 +-
modules/http/http_request.c | 2 +-
modules/http2/.gitignore | 35 +
.../NWGNUcach_socache => http2/NWGNUmakefile} | 101 +-
modules/http2/README.h2 | 70 +
modules/http2/config.m4 | 189 +++
modules/http2/h2_alt_svc.c | 132 ++
modules/http2/h2_alt_svc.h | 39 +
modules/http2/h2_config.c | 386 ++++++
modules/http2/h2_config.h | 74 ++
modules/http2/h2_conn.c | 532 ++++++++
modules/http2/h2_conn.h | 60 +
modules/http2/h2_conn_io.c | 312 +++++
modules/http2/h2_conn_io.h | 58 +
modules/http2/h2_ctx.c | 90 ++
modules/http2/h2_ctx.h | 63 +
modules/http2/h2_from_h1.c | 570 ++++++++
modules/http2/h2_from_h1.h | 82 ++
modules/http2/h2_h2.c | 232 ++++
modules/http2/h2_h2.h | 57 +
modules/http2/h2_io.c | 164 +++
modules/http2/h2_io.h | 126 ++
modules/http2/h2_io_set.c | 180 +++
modules/http2/h2_io_set.h | 47 +
modules/http2/h2_mplx.c | 802 +++++++++++
modules/http2/h2_mplx.h | 322 +++++
modules/http2/h2_private.h | 36 +
modules/http2/h2_request.c | 182 +++
modules/http2/h2_request.h | 67 +
modules/http2/h2_response.c | 232 ++++
modules/http2/h2_response.h | 47 +
modules/http2/h2_session.c | 1270 ++++++++++++++++++
modules/http2/h2_session.h | 163 +++
modules/http2/h2_stream.c | 273 ++++
modules/http2/h2_stream.h | 107 ++
modules/http2/h2_stream_set.c | 164 +++
modules/http2/h2_stream_set.h | 52 +
modules/http2/h2_switch.c | 181 +++
modules/http2/h2_switch.h | 29 +
modules/http2/h2_task.c | 467 +++++++
modules/http2/h2_task.h | 187 +++
modules/http2/h2_task_input.c | 222 ++++
modules/http2/h2_task_input.h | 46 +
modules/http2/h2_task_output.c | 132 ++
modules/http2/h2_task_output.h | 56 +
modules/http2/h2_task_queue.c | 88 ++
modules/http2/h2_task_queue.h | 148 +++
modules/http2/h2_to_h1.c | 305 +++++
modules/http2/h2_to_h1.h | 87 ++
modules/http2/h2_util.c | 649 +++++++++
modules/http2/h2_util.h | 124 ++
modules/http2/h2_version.h | 34 +
modules/http2/h2_worker.c | 170 +++
modules/http2/h2_worker.h | 155 +++
modules/http2/h2_workers.c | 352 +++++
modules/http2/h2_workers.h | 87 ++
modules/http2/mod_h2.h | 19 +
modules/http2/mod_http2.c | 146 ++
modules/http2/mod_http2.dsp | 207 +++
modules/ldap/util_ldap.c | 24 +-
modules/ldap/util_ldap_cache.c | 8 +-
modules/loggers/mod_log_config.c | 9 +-
modules/loggers/mod_logio.c | 78 +-
modules/lua/config.m4 | 117 +-
modules/lua/lua_config.c | 3 +-
modules/mappers/mod_dir.c | 8 +
modules/mappers/mod_negotiation.c | 20 +-
modules/mappers/mod_rewrite.c | 129 +-
modules/mappers/mod_vhost_alias.c | 2 +-
modules/metadata/mod_cern_meta.c | 4 +-
modules/metadata/mod_ident.c | 4 +-
modules/metadata/mod_setenvif.c | 2 +-
modules/proxy/NWGNUproxy | 1 +
modules/proxy/ajp_header.c | 31 +-
modules/proxy/ajp_msg.c | 2 +-
modules/proxy/mod_proxy.c | 17 +
modules/proxy/mod_proxy_balancer.c | 6 +-
modules/proxy/mod_proxy_ftp.c | 2 +-
modules/proxy/mod_proxy_http.c | 15 +-
modules/proxy/proxy_util.c | 97 +-
modules/session/mod_session_dbd.c | 18 +-
modules/slotmem/mod_slotmem_shm.c | 148 ++-
modules/ssl/README.dsov.fig | 2 +-
modules/ssl/README.dsov.ps | 2 +-
modules/ssl/mod_ssl.c | 16 +-
modules/ssl/ssl_engine_config.c | 21 +-
modules/ssl/ssl_engine_init.c | 143 +-
modules/ssl/ssl_engine_io.c | 56 +-
modules/ssl/ssl_engine_kernel.c | 224 ++--
modules/ssl/ssl_engine_log.c | 8 +-
modules/ssl/ssl_engine_pphrase.c | 2 +-
modules/ssl/ssl_engine_vars.c | 54 +-
modules/ssl/ssl_private.h | 30 +-
modules/ssl/ssl_scache.c | 6 +-
modules/ssl/ssl_util.c | 46 +
modules/ssl/ssl_util_ssl.c | 275 ++--
modules/ssl/ssl_util_ssl.h | 41 +-
modules/test/mod_optional_fn_import.c | 4 +-
os/win32/BaseAddr.ref | 1 +
server/core.c | 123 +-
server/core_filters.c | 1 -
server/listen.c | 215 ++-
server/log.c | 16 +-
server/mpm/config.m4 | 4 +-
server/mpm/event/event.c | 223 +++-
server/mpm/mpmt_os2/mpmt_os2.c | 2 +-
server/mpm/netware/mpm_netware.c | 3 +-
server/mpm/prefork/prefork.c | 169 ++-
server/mpm/winnt/mpm_winnt.c | 21 +-
server/mpm/worker/worker.c | 265 +++-
server/protocol.c | 158 +++
server/request.c | 7 +-
server/util.c | 114 ++
server/util_script.c | 17 +-
support/ab.c | 16 +-
support/htdbm.c | 2 +-
support/logresolve.c | 8 +-
support/passwd_common.c | 6 +-
316 files changed, 19576 insertions(+), 4593 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