httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r1769588 [1/17] - in /httpd/httpd/branches/2.4.x-openssl-1.1.0-compat: ./ docs/conf/ docs/manual/ docs/manual/howto/ docs/manual/mod/ docs/manual/platform/ docs/manual/programs/ docs/manual/rewrite/ include/ modules/ modules/aaa/ modules/ar...
Date Mon, 14 Nov 2016 10:26:34 GMT
Author: jorton
Date: Mon Nov 14 10:26:31 2016
New Revision: 1769588

URL: http://svn.apache.org/viewvc?rev=1769588&view=rev
Log:
Merged to latest 2.4.x.

Added:
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_headers.c
      - copied unchanged from r1769587, httpd/httpd/branches/2.4.x/modules/http2/h2_headers.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_headers.h
      - copied unchanged from r1769587, httpd/httpd/branches/2.4.x/modules/http2/h2_headers.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/proxy/NWGNUproxyhcheck
      - copied unchanged from r1769587, httpd/httpd/branches/2.4.x/modules/proxy/NWGNUproxyhcheck
Removed:
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_response.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_response.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_stream_set.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_stream_set.h
Modified:
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/   (props changed)
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/CHANGES
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/CMakeLists.txt
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/STATUS
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/acinclude.m4
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/configure.in
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/conf/httpd.conf.in
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/   (props changed)
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/caching.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/caching.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/caching.html.tr.utf8
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/caching.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/caching.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/caching.xml.meta
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/caching.xml.tr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/expr.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/expr.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/expr.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/expr.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/howto/http2.xml   (contents, props changed)
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/install.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/install.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/install.html.tr.utf8
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/install.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/install.xml.de
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/install.xml.es
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/install.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/install.xml.ja
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/install.xml.ko
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/install.xml.meta
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/install.xml.tr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/core.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/core.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/core.html.tr.utf8
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/core.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/core.xml.de
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/core.xml.es
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/core.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/core.xml.ja
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/core.xml.meta
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/core.xml.tr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_alias.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_alias.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_alias.html.tr.utf8
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_alias.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_alias.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_alias.xml.ja
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_alias.xml.ko
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_alias.xml.meta
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_alias.xml.tr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_authz_groupfile.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_authz_groupfile.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dbd.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dbd.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dbd.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dbd.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dir.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dir.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dir.html.tr.utf8
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dir.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dir.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dir.xml.ja
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dir.xml.ko
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_dir.xml.tr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_filter.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_heartbeat.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_heartmonitor.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_http2.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_http2.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_imagemap.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_isapi.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_proxy_html.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_proxy_html.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_proxy_html.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_proxy_html.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_rewrite.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_rewrite.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_rewrite.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_rewrite.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_rewrite.xml.meta
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_setenvif.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_setenvif.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_ssl.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_ssl.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_ssl.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mod_ssl.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mpm_common.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mpm_common.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mpm_common.html.tr.utf8
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mpm_common.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mpm_common.xml.de
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mpm_common.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mpm_common.xml.ja
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mpm_common.xml.tr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mpm_netware.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mpm_winnt.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/mpmt_os2.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/prefork.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/quickreference.html.de
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/quickreference.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/quickreference.html.es
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/quickreference.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/quickreference.html.ja.utf8
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/quickreference.html.ko.euc-kr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/quickreference.html.tr.utf8
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/quickreference.html.zh-cn.utf8
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/quickreference.xml.es
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/quickreference.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/quickreference.xml.meta
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/mod/worker.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/platform/windows.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/programs/index.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/rewrite/flags.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/rewrite/flags.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/rewrite/flags.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/rewrite/flags.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/rewrite/vhosts.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/rewrite/vhosts.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/rewrite/vhosts.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/rewrite/vhosts.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/sections.html.en
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/sections.html.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/sections.xml
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/sections.xml.fr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/sections.xml.ja
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/sections.xml.ko
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/manual/sections.xml.tr
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/include/ap_mmn.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/include/http_config.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/include/http_log.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/include/http_request.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/include/httpd.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/include/util_ldap.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/NWGNUmakefile
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/aaa/mod_allowmethods.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/aaa/mod_auth_basic.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/aaa/mod_auth_digest.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/aaa/mod_auth_form.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/aaa/mod_authn_dbd.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/aaa/mod_authz_core.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/aaa/mod_authz_groupfile.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/arch/netware/mod_nw_ssl.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/arch/win32/mod_isapi.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/arch/win32/mod_isapi.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/cache/mod_cache.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/cluster/README.heartbeat
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/core/mod_macro.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/core/mod_so.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/dav/main/mod_dav.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/dav/main/mod_dav.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/dav/main/util.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/examples/README
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/filters/mod_reqtimeout.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/generators/mod_cgid.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/generators/mod_status.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http/http_core.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http/http_filters.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http/http_protocol.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http/http_request.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/NWGNUmod_http2
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/NWGNUproxyht2
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/README.h2
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/config2.m4
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_bucket_beam.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_bucket_beam.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_config.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_conn.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_conn.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_conn_io.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_ctx.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_filter.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_filter.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_from_h1.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_from_h1.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_h2.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_h2.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_mplx.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_mplx.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_ngn_shed.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_ngn_shed.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_proxy_session.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_proxy_session.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_proxy_util.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_proxy_util.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_push.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_push.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_request.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_request.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_session.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_session.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_stream.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_stream.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_switch.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_task.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_task.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_util.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_util.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_version.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_worker.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/h2_workers.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/mod_http2.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/mod_http2.dep
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/mod_http2.dsp
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/mod_http2.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/mod_http2.mak
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/http2/mod_proxy_http2.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/ldap/util_ldap_cache_mgr.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/loggers/mod_log_config.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/lua/mod_lua.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/mappers/mod_actions.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/mappers/mod_negotiation.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/mappers/mod_rewrite.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/metadata/mod_env.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/metadata/mod_mime_magic.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/metadata/mod_remoteip.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/metadata/mod_version.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/proxy/NWGNUproxy
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/proxy/mod_proxy.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/proxy/mod_proxy.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/proxy/mod_proxy_ajp.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/proxy/mod_proxy_balancer.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/proxy/mod_proxy_connect.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/proxy/mod_proxy_fcgi.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/proxy/mod_proxy_hcheck.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/proxy/mod_proxy_http.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/proxy/proxy_util.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/slotmem/mod_slotmem_shm.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/ssl/README
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/ssl/ssl_engine_init.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/ssl/ssl_engine_io.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/ssl/ssl_engine_kernel.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/modules/ssl/ssl_engine_vars.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/os/bs2000/ebcdic.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/os/netware/pre_nw.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/os/win32/ap_regkey.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/config.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/core.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/gen_test_char.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/listen.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/mpm/event/event.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/mpm/prefork/prefork.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/mpm/winnt/child.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/mpm/winnt/mpm_winnt.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/mpm/winnt/mpm_winnt.h
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/mpm/winnt/service.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/mpm/worker/worker.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/mpm_unix.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/util_script.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/server/vhost.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/support/ab.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/support/checkgid.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/support/htcacheclean.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/support/logresolve.c
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/support/logresolve.pl.in
    httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/test/make_sni.sh

Propchange: httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 14 10:26:31 2016
@@ -1,5 +1,6 @@
 /httpd/httpd/branches/2.4.17-protocols-changes:1712542-1715252
 /httpd/httpd/branches/2.4.17-protocols-http2:1701609-1705681
+/httpd/httpd/branches/2.4.x:1755809-1769587
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1200475,1200478,1200482,1200491,1200496,1200513,1200550,1200556,1200580,1200605,1200612,1200614,1200639,1200646,1200656,1200667,1200679,1200699,1200702,1200955,1200957,1200961,1200963,1200968,1200975,1200977,1201032,1201042,1201111,1201194,1201198,1201202,1201443,1201450,1201460,1201956,1202236,1202453,1202456,1202886,1203400,1203491,1203632,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351-1211352,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213380-1213381,1213391,1213399,1213567,1214003,1214005,1214015,12
 15514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1222930,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231255,1231257,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242089,1242798,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1292043,1293405,1293534-1293535,1293658,1293678,1293708,1294306,1294349,1294356,1294358,1294372,1294471,1297560,1299718,1299786,1300766,1301111,1301725,1302444,1302483,1302653,1302665,1302674,1303201,1303435,1303827,1304087,1304874-1304875,1305167
 ,1305586,1306350,1306409,1306426,1306841,1307790,1308327,1308459,1309536,1309567,1311468,1324760,1325218,1325227,1325250,1325265,1325275,1325632,1325724,1326980,1326984,1326991,1327689,1328325-1328326,1328339,1328345,1328950,1330189,1330964,1331110,1331115,1331942,1331977,1332378,1333969,1334343,1335882,1337344,1341906,1341913,1343085,1343087,1343094,1343099,1343109,1343935,1345319,1345329,1346905,1347980,1348036,1348653,1348656,1348660,1349905,1351012-1351020,1351071-1351072,1351074,1351737,1352047,1352534,1352909-1352912,1357685,1358061,1359057,1359881,1359884,1361153,1361298,1361766,1361773,1361778,1361784,1361791-1361792,1361801,1361803,1362020,1362538,1362707,1363035,1363183,1363186,1363312,1363440,1363557,1363589,1363829,1363832,1363836-1363837,1363853,1364133,1364138,1364229,1364601,1364695,1365001,1365020,1365029,1365479,1366319,1366344,1366621,1367778,1367819,1368053,1368058,1368094,1368121,1368131,1368393,1368396,1369419,1369568,1369604,1369618,1369904,1369995,1369999,1370
 001,1370466,1370592,1370615-1370616,1370763,1371387,1371791,1371801,1371878,1371903,1373270,1373447,1373898,1373955,1374157,1374199,1374247,1374874,1374877,1374880,1375006,1375009,1375011,1375013,1375584,1376695,1376700,1378178,1383490,1384408,1384913,1386576,1386578,1386726,1386822,1386880,1386913,1387085,1387088,1387110,1387389,1387444,1387603,1387607,1387633,1387693,1387979,1388029,1388445,1388447,1388648,1388660,1388825,1388899,1389316,1389339,1389481,1389506,1389564,1389566-1389569,1390562,1390564,1391396,1391398,1391771,1392120,1392122,1392150,1392214,1392345-1392347,1392850,1393033,1393058,1393152,1393338,1393564,1394079,1395225,1395253-1395256,1395792,1396440,1397172,1397320,1397636,1397687,1397710,1397716,1398025,1398040,1398066,1398478,1398480-1398481,1398970,1399413,1399687,1399708,1400700,1401448,1402924,1403476,1403483,1403492,1404653,1405407,1405856,1405973,1406068,1406493,1406495,1406616,1406646,1406760,1407004,1407006,1407085,1407088,1407248,1407381,1407459-1407460,1
 407528,1407853,1407965,1408093,1408402,1408958,1408961,1409170,1409437,1409726,1409800,1410681,1410954,1411862,1412278,1413732,1414094,1415008,1415023,1415075,1416121,1416150,1416278,1417197,1417440,1417529,1418524,1418556,1418648,1418655,1418703,1418721,1418752,1418769,1419084,1419719,1419726,1419755,1419781,1419796,1420120,1420124,1420149,1420184,1420644,1420685-1420686,1420975,1421288,1421305,1421323,1421851,1421912,1421953,1422135,1422549,1422594,1422712,1422855,1422937,1422943,1422980,1423353,1423933,1425360,1425771-1425772,1425775,1425777,1425874,1426850,1426975,1427546,1428184,1428280,1428916,1429228,1429559,1429561,1429564,1429582,1430575,1430814,1430869,1433001,1433613,1433682,1433861,1433988,1435178,1435811,1436058,1436401,1439083,1439106,1439114,1439404,1439623,1442309,1442320,1442326,1442412,1442759,1442865,1447993,1448171,1448453,1451478,1451484,1451633,1451849,1451905,1451921,1452128,1452195,1452259,1452281,1452551,1452911,1452949,1452954,1453022,1453574,1453604,145387
 5-1453876,1453963,1453981,1454386,1454414-1454415,1454888,1457437,1457450,1457471,1457504,1457520-1457521,1457610,1457995,1458003-1458004,1458020,1458285,1458447,1458456,1462266,1462269,1462643,1463044-1463047,1463052,1463056,1463455,1463736,1463750,1463754,1464675,1464721,1464762,1465115-1465116,1465190,1467765,1468581,1470183,1470679,1470940,1471449,1475878,1476604,1476621,1476642,1476644-1476645,1476652,1476680,1477094,1477530,1478382,1478748,1479117,1479216,1479222,1479411,1479528,1479905,1479966,1480046,1480627,1481197,1481302,1481306,1481396-1481397,1481891,1482041,1482075,1482170,1482555,1482859,1482996,1483005,1483027,1483190,1484343,1484398,1484832,1484910,1484914,1485409,1485668,1486490,1487528,1487530,1488158,1488164,1488296,1488471,1488492,1488644,1490493,1490507,1490550,1490761,1490994,1491155,1491221,1491234,1491458,1491479,1491538,1491564,1491724,1492663,1492710,1492782,1493330,1493921,1493925,1494536,1495501,1496194,1496338,1496429,1496709,1497371,1497588,1498880,149
 9679,1500323,1500345,1500362,1500423,1500437,1500483,1500519,1501294,1501369,1501399,1501913,1502665,1502772,1503680,1503866,1503990-1503991,1504276,1506474,1506714,1509872,1509983,1510084-1510085,1510098,1510588,1510707,1511093,1513492,1513508,1514039,1514064,1514214-1514215,1514255,1514267,1514617,1515050,1515162,1515403,1515411,1515420,1517025,1517045,1517175,1517366,1517386,1517388,1518265,1518269,1519475,1520368,1520445,1520760,1520908,1521909,1523235,1523239,1523281,1523387,1524101,1524158,1524192,1524368,1524388,1524770,1525276,1525280-1525281,1525931,1526168,1526189,1526647,1526666,1527008,1527220,1527291,1527294-1527295,1527509,1527925-1527926,1528143,1528718,1529014,1529277,1529449,1529559,1529988,1529991,1530793,1531340,1531370,1531505,1531672,1531961-1531962,1532746,1532816,1533065,1533224,1534321,1534754,1534890,1534892,1536310,1537535,1538490,1540051-1540052,1541181,1541270,1541368,1542338,1542379,1542533,1542562,1542615,1543020,1543147,1543149,1543174,1544381,1544774,
 1544784,1544812,1544820,1545286,1545292,1545325,1545364,1545408,1545411,1546692-1546693,1546730,1546759-1546760,1546801,1546804-1546805,1546835-1546836,1547845,1550061,1550302,1550307,1551685,1551714,1551802,1552130,1552227,1553204,1553824,1554161,1554168,1554170,1554175-1554176,1554179,1554181,1554184,1554188,1554192,1554195,1554276,1554281,1554300-1554301,1554994-1554995,1555240,1555259,1555266,1555423-1555424,1555463-1555464,1555467,1555555,1555569,1556206,1556428,1556911-1556912,1556914,1556937,1557317,1557617,1558483,1559351,1559828,1560367,1560546,1560679,1560689,1560729,1560977,1560979,1561137,1561262,1561385,1561660,1561923,1562472,1563193,1563379,1563381,1563417-1563418,1563420,1564052,1564437,1564475,1564756,1564760,1565081,1565711,1568404,1569615,1570288,1570598,1571369,1572092,1572198,1572543,1572561,1572611,1572630,1572655,1572663,1572668-1572671,1572896,1572905,1572911,1572967,1573224,1573229,1573626,1574151,1575400,1576233,1576741,1578760,1578762,1580568,1583005,15830
 07-1583008,1583027,1583175,1583191,1584098,1584430,1584434,1584572,1584653,1584658,1584665,1584703,1584878,1584884,1584896,1585054,1585072,1585090,1585435,1585609,1585824,1585918-1585919,1586745,1586827,1587036,1587040,1587053,1587255,1587594,1587607,1587639,1587654,1588054,1588065,1588213,1588330,1588427,1588519,1588527,1588704,1588851,1588853,1588868,1589413,1590437,1590509,1591143,1591320,1591322,1591328,1591390,1591394,1591401,1591472,1591508,1592032,1592037,1592500,1592511,1592514,1592529,1592615,1592632,1593745,1594625,1594643,1594648,1595305,1595321,1595426,1597182,1597349,1597352,1597639,1597642,1598107,1598946,1599535,1601076,1601184-1601185,1601274,1601291,1601624,1601630,1601919,1601995,1602338,1602978,1602989,1603027,1603029,1603122,1603156,1603915,1604382,1604461,1604631,1605207,1605827,1605829,1607960,1608284,1608785,1608999,1609914,1609936,1609938,1610207,1610311,1610353,1610366,1610491,1610652,1610674,1611165,1611169,1611244,1611600,1611871,1611978,1612068,1615026,16
 15289,1617018,1618401,1618541,1619297,1619383,1619444,1619483,1619835,1620324,1620461,1620932,1621367,1621372,1621417,1621453,1621806,1622450,1624234,1624349,1625196,1625952,1626050,1626978,1628104,1628918-1628919,1628924,1628950,1629235,1629239,1629244,1629250,1629372,1629440-1629441,1629485,1629507-1629508,1629519,1629577,1629652,1629916,1631885,1632454,1632740,1632742,1633730-1633731,1633793,1634120,1634237,1634425,1634736,1634836,1635510,1635558,1635644-1635645,1635762,1637112,1638072-1638073,1638879,1639614,1640031,1640036,1640040,1640042,1640331,1641077,1641095,1641376,1642099,1642484,1642499,1642847,1642868,1643034,1643284,1643537,1643825,1644245,1646282,1646724,1647035,1648201,1648394,1648433,1648719,1648840,1649001,1649043,1649632,1649966,1650047,1650061,1650309-1650310,1650320,1651088,1652829,1652929,1652931,1652955,1652982,1652985,1652989,1653941,1653978,1653997,1656225,1656669,1657256,1657261,1657636,1657638,1657685,1657881,1657897,1658760,1658765,1661067,1661258,1661448
 ,1661464,1661486,1662245-1662246,1663017,1663647,1664071,1664133,1664205,1664299,1664709,1665215,1665218,1665625,1665643,1665721,1666297,1666361,1666363,1666468,1666618,1666998,1667385-1667386,1668532,1668535,1668553,1669130,1669289,1669292,1670434,1671364,1671396-1671397,1671918,1672289,1672453,1672466,1672480,1672483,1672564,1672757,1672985,1672989,1673113,1673155,1673368,1673455,1673769,1674056,1674538,1674542,1674606,1674632,1674697,1675103,1675410,1675533,1676085,1676654,1676709,1676842,1677096,1677143-1677146,1677149,1677151,1677153-1677156,1677159,1677339,1677462,1677702,1677830,1677832,1677834-1677835,1678763,1679032,1679181-1679182,1679192,1679428,1679432,1679470,1679620,1679712,1680276,1680895,1680900,1680942,1681037,1681424,1681440,1681685,1681694,1681795,1682482,1682816,1682819,1682907,1682923,1682937,1682979,1682988,1683044,1683047,1683123,1683881,1683884,1684057,1684171,1684900,1685069,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1686853,1686
 856,1687539,1687680,1687980,1688274,1688331,1688339-1688341,1688343,1688474-1688475,1688536,1688538,1688660,1689325,1689605,1689694,1689698,1690120,1690137,1690248,1691374,1691582,1691592,1691819,1691908,1692285,1692432,1692486,1692516,1693792,1693918-1693919,1693963,1694903,1694936,1694950-1694951,1695170,1695727,1695874,1695885,1695920,1696105,1696264,1696266,1696279,1696428,1696442,1696565,1696592,1696607,1696755,1696881,1697013,1697015,1697051,1697323,1697339,1697370,1697389,1697446,1697543,1697634,1697855,1698023,1698103,1698107,1698116,1698133,1698330,1700271,1700275,1700317-1700322,1700326,1700328,1700330-1700332,1700334,1700336,1700338,1700418,1700514,1700777,1700851,1700917,1700925,1700968,1701005,1701145,1701178,1701204,1701347,1701436,1701545,1701717,1702643,1702919,1703152,1703417,1703642,1703807,1703813,1703822,1703871,1703902,1703952,1704099,1704241,1704262,1704797,1704799,1704826,1705099,1705134,1705194,1705217,1705257,1705749,1705776,1705823,1705826,1705828,1705833,1
 705983,1706275,1706627,1706635,1706637,1706640,1706918,1706942,1706989,1707002,1707230-1707231,1707497,1707519,1707591,1707626-1707627,1707640,1707831,1707883,1707889,1708107,1709008,1709587,1709596,1709602,1709995,1710095,1710105,1710231,1710380,1710391,1710419,1710572,1710583,1710723,1711479,1711553,1711648,1711728,1711902,1712382,1713040,1713209,1713937,1715023,1715255,1715273,1715567-1715568,1715570-1715572,1715576,1715581-1715585,1715886,1716211,1716388,1716460,1716487,1716660,1716940,1717063,1717086,1717639,1717816,1717934,1717958,1717975,1717985,1718314,1718338,1718400,1718514,1718556,1718569,1718598,1719016,1719018,1719189-1719190,1719252,1719254-1719255,1719257,1719967,1720129,1720996,1721313,1721685,1721899,1722137,1722154,1722177,1722195,1722229,1722320,1722328,1722334,1722350-1722351,1722358,1722377,1722572,1722701,1723122,1723143,1723284,1723295,1723567,1723953,1724847,1724857,1724879,1724992-1724993,1724995,1725018,1725031,1725090,1725120,1725149,1725325,1725328,172538
 7,1725392,1725394-1725395,1725445,1725468,1725485,1725489,1725498-1725499,1725516,1725523,1725545,1725567,1725581,1725602,1725822,1725940,1725967,1726009,1726026,1726038,1726049,1726051-1726052,1726055,1726086,1726167,1726233,1726798,1726881,1726888,1727071,1727111,1727317,1727544,1727573,1727603,1727842,1728326,1728907,1728909,1728979,1728981,1729032,1729037,1729208,1729341,1729374,1729376,1729435,1729498,1729500,1729581,1729826,1729847,1729927,1729929-1729931,1729960,1729968,1729998,1730146,1730297,1730314,1730316,1730351,1730422,1730640,1730723,1730865,1731012,1731423,1731929,1732252,1732353,1732369,1732716,1732954,1732986,1733056,1733064,1733068,1733088-1733089,1733275,1733523,1733537,1733691,1734006,1734125,1734239,1734294,1734412,1734561,1734807,1734817,1734947,1734955,1734989,1735088,1735159,1735337,1735608-1735609,1735611,1735668,1735786,1735875,1735877-1735878,1735882-1735883,1735891,1735925,1735931,1735935,1735941-1735942,1735952,1736156,1736243,1736250,1736463,1736681,173
 6686,1737006,1737014,1737020-1737021,1737102,1737114,1737125,1737254,1737256,1737265,1737447,1737449,1737451,1737476,1737657,1738217,1738331,1738333,1738410,1738461,1738563,1739008,1739146,1739151,1739193,1739303,1739312,1739738,1739932,1740075,1740084,1740108,1740110,1740155,1740652-1740653,1740735,1741045,1741065,1741112,1741115,1741268,1741310,1741392,1741414,1741446,1741461,1741557,1741564,1741596,1741621,1741648,1741934,1742005,1742135,1742260,1742359,1742444-1742447,1742460,1742791-1742792,1743335,1743517,1743699,1743788,1743816,1744203-1744204,1744206,1744283,1744415,1744421,1744458-1744459,1744712,1744751,1744767,1744778,1744980,1745034,1745175,1745767,1745835,1746647,1746988,1747170,1747531,1747550,1747735,1747808,1747810,1747946,1748368,1748448,1748531,1748653,1748888,1749151,1749401,1749404,1749505,1749658-1749659,1749676,1749678,1749695,1749924-1749925,1750043,1750218,1750335,1750407,1750420,1750507,1750553,1750567,1750750,1750779,1751970,1752087,1752096,1752145,1752415,
 1753224,1753498,1753541,1753777,1755657,1755725,1755856,1755874,1755881,1756163
+/httpd/httpd/trunk:1200475,1200478,1200482,1200491,1200496,1200513,1200550,1200556,1200580,1200605,1200612,1200614,1200639,1200646,1200656,1200667,1200679,1200699,1200702,1200955,1200957,1200961,1200963,1200968,1200975,1200977,1201032,1201042,1201111,1201194,1201198,1201202,1201443,1201450,1201460,1201956,1202236,1202453,1202456,1202886,1203400,1203491,1203632,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351-1211352,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213380-1213381,1213391,1213399,1213567,1214003,1214005,1214015,12
 15514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1222930,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231255,1231257,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242089,1242798,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1292043,1293405,1293534-1293535,1293658,1293678,1293708,1294306,1294349,1294356,1294358,1294372,1294471,1297560,1299718,1299786,1300766,1301111,1301725,1302444,1302483,1302653,1302665,1302674,1303201,1303435,1303827,1304087,1304874-1304875,1305167
 ,1305586,1306350,1306409,1306426,1306841,1307790,1308327,1308459,1309536,1309567,1311468,1324760,1325218,1325227,1325250,1325265,1325275,1325632,1325724,1326980,1326984,1326991,1327689,1328325-1328326,1328339,1328345,1328950,1330189,1330964,1331110,1331115,1331942,1331977,1332378,1333969,1334343,1335882,1337344,1341906,1341913,1343085,1343087,1343094,1343099,1343109,1343935,1345319,1345329,1346905,1347980,1348036,1348653,1348656,1348660,1349905,1351012-1351020,1351071-1351072,1351074,1351737,1352047,1352534,1352909-1352912,1357685,1358061,1359057,1359881,1359884,1361153,1361298,1361766,1361773,1361778,1361784,1361791-1361792,1361801,1361803,1362020,1362538,1362707,1363035,1363183,1363186,1363312,1363440,1363557,1363589,1363829,1363832,1363836-1363837,1363853,1364133,1364138,1364229,1364601,1364695,1365001,1365020,1365029,1365479,1366319,1366344,1366621,1367778,1367819,1368053,1368058,1368094,1368121,1368131,1368393,1368396,1369419,1369568,1369604,1369618,1369904,1369995,1369999,1370
 001,1370466,1370592,1370615-1370616,1370763,1371387,1371791,1371801,1371878,1371903,1373270,1373447,1373898,1373955,1374157,1374199,1374247,1374874,1374877,1374880,1375006,1375009,1375011,1375013,1375584,1376695,1376700,1378178,1383490,1384408,1384913,1386576,1386578,1386726,1386822,1386880,1386913,1387085,1387088,1387110,1387389,1387444,1387603,1387607,1387633,1387693,1387979,1388029,1388445,1388447,1388648,1388660,1388825,1388899,1389316,1389339,1389481,1389506,1389564,1389566-1389569,1390562,1390564,1391396,1391398,1391771,1392120,1392122,1392150,1392214,1392345-1392347,1392850,1393033,1393058,1393152,1393338,1393564,1394079,1395225,1395253-1395256,1395792,1396440,1397172,1397320,1397636,1397687,1397710,1397716,1398025,1398040,1398066,1398478,1398480-1398481,1398970,1399413,1399687,1399708,1400700,1401448,1402924,1403476,1403483,1403492,1404653,1405407,1405856,1405973,1406068,1406493,1406495,1406616,1406646,1406760,1407004,1407006,1407085,1407088,1407248,1407381,1407459-1407460,1
 407528,1407853,1407965,1408093,1408402,1408958,1408961,1409170,1409437,1409726,1409800,1410681,1410954,1411862,1412278,1413732,1414094,1415008,1415023,1415075,1416121,1416150,1416278,1417197,1417440,1417529,1418524,1418556,1418648,1418655,1418703,1418721,1418752,1418769,1419084,1419719,1419726,1419755,1419781,1419796,1420120,1420124,1420149,1420184,1420644,1420685-1420686,1420975,1421288,1421305,1421323,1421851,1421912,1421953,1422135,1422549,1422594,1422712,1422855,1422937,1422943,1422980,1423353,1423933,1425360,1425771-1425772,1425775,1425777,1425874,1426850,1426975,1427546,1428184,1428280,1428916,1429228,1429559,1429561,1429564,1429582,1430575,1430814,1430869,1433001,1433613,1433682,1433861,1433988,1435178,1435811,1436058,1436401,1439083,1439106,1439114,1439404,1439623,1442309,1442320,1442326,1442412,1442759,1442865,1447993,1448171,1448453,1451478,1451484,1451633,1451849,1451905,1451921,1452128,1452195,1452259,1452281,1452551,1452911,1452949,1452954,1453022,1453574,1453604,145387
 5-1453876,1453963,1453981,1454386,1454414-1454415,1454888,1457437,1457450,1457471,1457504,1457520-1457521,1457610,1457995,1458003-1458004,1458020,1458285,1458447,1458456,1462266,1462269,1462643,1463044-1463047,1463052,1463056,1463455,1463736,1463750,1463754,1464675,1464721,1464762,1465115-1465116,1465190,1467765,1468581,1470183,1470679,1470940,1471449,1475878,1476604,1476621,1476642,1476644-1476645,1476652,1476680,1477094,1477530,1478382,1478748,1479117,1479216,1479222,1479411,1479528,1479905,1479966,1480046,1480627,1481197,1481302,1481306,1481396-1481397,1481891,1482041,1482075,1482170,1482555,1482859,1482996,1483005,1483027,1483190,1484343,1484398,1484832,1484910,1484914,1485409,1485668,1486490,1487528,1487530,1488158,1488164,1488296,1488471,1488492,1488644,1490493,1490507,1490550,1490761,1490994,1491155,1491221,1491234,1491458,1491479,1491538,1491564,1491724,1492663,1492710,1492782,1493330,1493921,1493925,1494536,1495501,1496194,1496338,1496429,1496709,1497371,1497588,1498880,149
 9679,1500323,1500345,1500362,1500423,1500437,1500483,1500519,1501294,1501369,1501399,1501913,1502665,1502772,1503680,1503866,1503990-1503991,1504276,1506474,1506714,1509872,1509983,1510084-1510085,1510098,1510588,1510707,1511093,1513492,1513508,1514039,1514064,1514214-1514215,1514255,1514267,1514617,1515050,1515162,1515403,1515411,1515420,1517025,1517045,1517175,1517366,1517386,1517388,1518265,1518269,1519475,1520368,1520445,1520760,1520908,1521909,1523235,1523239,1523281,1523387,1524101,1524158,1524192,1524368,1524388,1524770,1525276,1525280-1525281,1525931,1526168,1526189,1526647,1526666,1527008,1527220,1527291,1527294-1527295,1527509,1527925-1527926,1528143,1528718,1529014,1529277,1529449,1529559,1529988,1529991,1530793,1531340,1531370,1531505,1531672,1531961-1531962,1532746,1532816,1533065,1533224,1534321,1534754,1534890,1534892,1536310,1537535,1538490,1540051-1540052,1541181,1541270,1541368,1542338,1542379,1542533,1542562,1542615,1543020,1543147,1543149,1543174,1544381,1544774,
 1544784,1544812,1544820,1545286,1545292,1545325,1545364,1545408,1545411,1546692-1546693,1546730,1546759-1546760,1546801,1546804-1546805,1546835-1546836,1547845,1550061,1550302,1550307,1551685,1551714,1551802,1552130,1552227,1553204,1553824,1554161,1554168,1554170,1554175-1554176,1554179,1554181,1554184,1554188,1554192,1554195,1554276,1554281,1554300-1554301,1554994-1554995,1555240,1555259,1555266,1555423-1555424,1555463-1555464,1555467,1555555,1555569,1556206,1556428,1556911-1556912,1556914,1556937,1557317,1557617,1558483,1559351,1559828,1560367,1560546,1560679,1560689,1560729,1560977,1560979,1561137,1561262,1561385,1561660,1561923,1562472,1563193,1563379,1563381,1563417-1563418,1563420,1564052,1564437,1564475,1564756,1564760,1565081,1565711,1568404,1569615,1570288,1570598,1571369,1572092,1572198,1572543,1572561,1572611,1572630,1572655,1572663,1572668-1572671,1572896,1572905,1572911,1572967,1573224,1573229,1573626,1574151,1575400,1576233,1576741,1578760,1578762,1580568,1583005,15830
 07-1583008,1583027,1583175,1583191,1584098,1584430,1584434,1584572,1584653,1584658,1584665,1584703,1584878,1584884,1584896,1585054,1585072,1585090,1585435,1585609,1585824,1585918-1585919,1586745,1586827,1587036,1587040,1587053,1587255,1587594,1587607,1587639,1587654,1588054,1588065,1588213,1588330,1588427,1588519,1588527,1588704,1588851,1588853,1588868,1589413,1590437,1590509,1591143,1591320,1591322,1591328,1591390,1591394,1591401,1591472,1591508,1592032,1592037,1592500,1592511,1592514,1592529,1592615,1592632,1593745,1594625,1594643,1594648,1595305,1595321,1595426,1597182,1597349,1597352,1597639,1597642,1598107,1598946,1599535,1601076,1601184-1601185,1601274,1601291,1601624,1601630,1601919,1601995,1602338,1602978,1602989,1603027,1603029,1603122,1603156,1603915,1604382,1604461,1604631,1605207,1605827,1605829,1607960,1608284,1608785,1608999,1609914,1609936,1609938,1610207,1610311,1610353,1610366,1610491,1610652,1610674,1611165,1611169,1611244,1611600,1611871,1611978,1612068,1615026,16
 15289,1617018,1618401,1618541,1619297,1619383,1619444,1619483,1619835,1620324,1620461,1620932,1621367,1621372,1621417,1621453,1621806,1622450,1624234,1624349,1625196,1625952,1626050,1626978,1628104,1628918-1628919,1628924,1628950,1629235,1629239,1629244,1629250,1629372,1629440-1629441,1629485,1629507-1629508,1629519,1629577,1629652,1629916,1631885,1632454,1632740,1632742,1633730-1633731,1633793,1634120,1634237,1634425,1634736,1634836,1635510,1635558,1635644-1635645,1635762,1637112,1638072-1638073,1638879,1639614,1640031,1640036,1640040,1640042,1640331,1641077,1641095,1641376,1642099,1642484,1642499,1642847,1642868,1643034,1643284,1643537,1643825,1644245,1646282,1646724,1647035,1648201,1648394,1648433,1648719,1648840,1649001,1649043,1649632,1649966,1650047,1650061,1650309-1650310,1650320,1651088,1652829,1652929,1652931,1652955,1652982,1652985,1652989,1653941,1653978,1653997,1656225,1656669,1657256,1657261,1657636,1657638,1657685,1657881,1657897,1658760,1658765,1661067,1661258,1661448
 ,1661464,1661486,1662245-1662246,1663017,1663647,1664071,1664133,1664205,1664299,1664709,1665215,1665218,1665625,1665643,1665721,1666297,1666361,1666363,1666468,1666618,1666998,1667385-1667386,1668532,1668535,1668553,1669130,1669289,1669292,1670434,1671364,1671396-1671397,1671918,1672289,1672453,1672466,1672480,1672483,1672564,1672757,1672985,1672989,1673113,1673155,1673368,1673455,1673769,1674056,1674538,1674542,1674606,1674632,1674697,1675103,1675410,1675533,1676085,1676654,1676709,1676842,1677096,1677143-1677146,1677149,1677151,1677153-1677156,1677159,1677339,1677462,1677702,1677830,1677832,1677834-1677835,1678763,1679032,1679181-1679182,1679192,1679428,1679432,1679470,1679620,1679712,1680276,1680895,1680900,1680942,1681037,1681424,1681440,1681685,1681694,1681795,1682482,1682816,1682819,1682907,1682923,1682937,1682979,1682988,1683044,1683047,1683123,1683881,1683884,1684057,1684171,1684900,1685069,1685339,1685345,1685347,1685349-1685350,1685650,1685659,1685779,1686085,1686853,1686
 856,1687539,1687680,1687980,1688274,1688331,1688339-1688341,1688343,1688399,1688474-1688475,1688536,1688538,1688660,1689325,1689605,1689694,1689698,1690120,1690137,1690248,1691374,1691582,1691592,1691819,1691908,1692285,1692432,1692486,1692516,1693792,1693918-1693919,1693963,1694903,1694936,1694950-1694951,1695170,1695727,1695874,1695885,1695920,1696105,1696264,1696266,1696279,1696428,1696442,1696565,1696592,1696607,1696755,1696881,1697013,1697015,1697051,1697323,1697339,1697370,1697389,1697446,1697543,1697634,1697855,1698023,1698103,1698107,1698116,1698133,1698330,1700271,1700275,1700317-1700322,1700326,1700328,1700330-1700332,1700334,1700336,1700338,1700418,1700514,1700777,1700851,1700917,1700925,1700968,1701005,1701145,1701178,1701204,1701347,1701436,1701545,1701717,1702643,1702919,1703152,1703417,1703642,1703807,1703813,1703822,1703871,1703902,1703952,1704099,1704241,1704262,1704797,1704799,1704826,1705099,1705134,1705194,1705217,1705257,1705749,1705776,1705823,1705826,1705828,1
 705833,1705983,1706275,1706627,1706635,1706637,1706640,1706918,1706942,1706989,1707002,1707230-1707231,1707497,1707519,1707591,1707626-1707627,1707640,1707831,1707883,1707889,1708107,1709008,1709587,1709596,1709602,1709995,1710095,1710105,1710231,1710380,1710391,1710419,1710572,1710583,1710723,1711479,1711553,1711648,1711728,1711902,1712382,1713040,1713209,1713937,1715023,1715255,1715273,1715567-1715568,1715570-1715572,1715576,1715581-1715585,1715886,1716211,1716388,1716460,1716487,1716660,1716940,1717063,1717086,1717639,1717816,1717934,1717958,1717975,1717985,1718314,1718338,1718400,1718514,1718556,1718569,1718598,1719016,1719018,1719189-1719190,1719252,1719254-1719255,1719257,1719967,1720129,1720996,1721313,1721685,1721899,1722137,1722154,1722177,1722195,1722229,1722320,1722328,1722334,1722350-1722351,1722358,1722377,1722572,1722701,1723122,1723143,1723284,1723295,1723567,1723953,1724847,1724857,1724879,1724992-1724993,1724995,1725018,1725031,1725090,1725120,1725149,1725325,172532
 8,1725387,1725392,1725394-1725395,1725445,1725468,1725485,1725489,1725498-1725499,1725516,1725523,1725545,1725567,1725581,1725602,1725822,1725940,1725967,1726009,1726026,1726038,1726049,1726051-1726052,1726055,1726086,1726167,1726233,1726798,1726881,1726888,1727071,1727111,1727317,1727544,1727573,1727603,1727842,1728326,1728804,1728907,1728909,1728979,1728981,1729032,1729037,1729208,1729341,1729374,1729376,1729435,1729498,1729500,1729581,1729826,1729847,1729927,1729929-1729931,1729960,1729968,1729998,1730146,1730297,1730314,1730316,1730351,1730422,1730640,1730723,1730865,1731012,1731423,1731929,1732228,1732252,1732353,1732369,1732716,1732954,1732986,1733056,1733064,1733068,1733088-1733089,1733275,1733523,1733537,1733691,1734006,1734125,1734239,1734294,1734412,1734561,1734807,1734817,1734947,1734955,1734989,1735088,1735159,1735337,1735608-1735609,1735611,1735668,1735786,1735875,1735877-1735878,1735882-1735883,1735891,1735925,1735931,1735935,1735941-1735942,1735952,1736156,1736243,173
 6250,1736463,1736681,1736686,1737006,1737014,1737020-1737021,1737102,1737114,1737125,1737254,1737256,1737265,1737447,1737449,1737451,1737476,1737657,1738217,1738331,1738333,1738410,1738461,1738563,1739008,1739146,1739151,1739193,1739201,1739303,1739312,1739738,1739932,1740075,1740084,1740108,1740110,1740155,1740652-1740653,1740735,1741045,1741065,1741112,1741115,1741268,1741310,1741392,1741414,1741446,1741461,1741557,1741564,1741596,1741621,1741648,1741934,1742005,1742135,1742260,1742359,1742444-1742447,1742460,1742791-1742792,1743335,1743517,1743699,1743788,1743816,1744203-1744204,1744206,1744283,1744415,1744421,1744458-1744459,1744712,1744751,1744767,1744778,1744980,1745034,1745175,1745767,1745835,1746207,1746647,1746988,1747170,1747531,1747550,1747735,1747808,1747810,1747946,1748047,1748155,1748368,1748448,1748531,1748653,1748888,1749151,1749401,1749404,1749505,1749658-1749659,1749676,1749678,1749695,1749924-1749925,1750043,1750218,1750335,1750392,1750407,1750412,1750416,1750420,
 1750474,1750494,1750507-1750508,1750553,1750567,1750750,1750779,1750854-1750855,1750947,1750955,1750960,1751970,1752087,1752096,1752145,1752347,1752415,1753167,1753224,1753228-1753229,1753257,1753315-1753316,1753498,1753541,1753592,1753594,1753777,1754129,1754391,1754399,1754414,1754534,1755323,1755657,1755725,1755856,1755874,1755881,1756038,1756163,1756611,1756844,1756846,1756852-1756853,1757010-1757011,1757524,1757534,1757540,1757662-1757663,1757985,1758003,1758083,1758307-1758311,1758446,1758558,1759984,1760018,1761434,1761477,1761479,1761548,1762517,1762703,1763158,1763246,1763613,1764005,1764040,1764236,1764243,1764255,1765318,1765328,1765357,1765420,1766097,1766129,1766160,1766308,1766424,1766691,1766851,1766857,1767128,1767180-1767181,1767553,1767564,1767803

Modified: httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/CHANGES?rev=1769588&r1=1769587&r2=1769588&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/CHANGES [utf-8] Mon Nov 14 10:26:31 2016
@@ -4,6 +4,117 @@ Changes with Apache 2.4.24
 
   *) mod_ssl: Add support for OpenSSL 1.1.0. [Rainer Jung]
  
+  *) mpm_unix: Apache fails to start if previously crashed then restarted with
+     the same PID (e.g. in container).  PR 60261.
+     [Val <valentin.bremond gmail.com>, Yann Ylavic]
+
+  *) mod_http2: unannounced and multiple interim responses (status code < 200)
+     are parsed and forwarded to client until a final response arrives.
+     [Stefan Eissing]
+  
+  *) mod_proxy_http2: improved robustness when main connection is closed early
+     by resetting all ongoing streams against the backend.
+     [Stefan Eissing]
+  
+  *) mod_http2: allocators from slave connections are released earlier, resulting
+     in less overall memory use on busy, long lived connections.
+     [Stefan Eissing]
+     
+  *) mod_remoteip: Pick up where we left off during a subrequest rather
+     than running with the modified XFF but original TCP address.
+     PR 49839/PR 60251
+
+  *) http: Respond with "408 Request Timeout" when a timeout occurs while
+     reading the request body.  [Yann Ylavic]
+
+  *) mod_http2: connection shutdown revisited: corrected edge cases on
+     shutting down ongoing streams, changed log warnings to be less noisy
+     when waiting on long running tasks. [Stefan Eissing]
+
+  *) mod_http2: changed all AP_DEBUG_ASSERT to ap_assert to have them 
+     available also in normal deployments. [Stefan Eissing]
+
+  *) mod_http2/mod_proxy_http2: 100-continue handling now properly implemented
+     up to the backend. Reused HTTP/2 proxy connections with more than a second
+     not used will block request bodies until a PING answer is received.
+     Requests headers are not delayed by this, since they are repeatable in
+     case of failure. This greatly increases robustness, especially with
+     busy server and/or low keepalive connections. [Stefan Eissing]
+     
+  *) mod_proxy_http2: fixed duplicate symbols with mod_http2.
+     [Stefan Eissing]
+  
+  *) mod_http2: rewrite of how responses and trailers are transferred between
+     master and slave connection. Reduction of internal states for tasks
+     and streams, stability. Heuristic id generation for slave connections
+     to better keep promise of connection ids unique at given point int time.
+     Fix for mod_cgid interop in high load situtations. 
+     Fix for handling of incoming trailers when no request body is sent.
+     [Stefan Eissing]
+  
+  *) mod_http2: fix suspended handling for streams. Output could become
+     blocked in rare cases. [Stefan Eissing]
+
+  *) mpm_winnt: Prevent a denial of service when the 'data' AcceptFilter is in
+     use by replacing it with the 'connect' filter. PR 59970. [Jacob Champion]
+
+  *) mod_cgid: Resolve a case where a short CGI response causes a subsequent
+     CGI to be killed prematurely, resulting in a truncated subsequent
+     response. [Eric Covener]
+
+  *) mod_proxy_hcheck: Set health check URI and expression correctly for health
+     check worker. PR 60038 [zdeno <zdeno@scnet.sk>]
+
+  *) mod_http2: if configured with nghttp2 1.14.0 and onward, invalid request
+     headers will immediately reset the stream with a PROTOCOL error. Feature
+     logged by module on startup as 'INVHD' in info message.
+     [Stefan Eissing]
+     
+  *) mod_http2: fixed handling of stream buffers during shutdown.
+     [Stefan Eissing]
+     
+  *) mod_reqtimeout: Fix body timeout disabling for CONNECT requests to avoid
+     triggering mod_proxy_connect's AH01018 once the tunnel is established.
+     [Yann Ylavic]
+
+  *) ab: Set the Server Name Indication (SNI) extension on outgoing TLS
+     connections (unless -I is specified), according to the Host header (if
+     any) or the requested URL's hostname otherwise.  [Yann Ylavic]
+
+  *) mod_proxy_fcgi: avoid loops when ProxyErrorOverride is enabled
+     and the error documents are proxied. PR 55415. [Luca Toscano]
+
+  *) mod_proxy_fcgi: read the whole FCGI response even when the content has
+     not been modified (HTTP 304) to avoid subsequent bougus reads and
+     confusing error messages logged. [Luca Toscano]
+
+  *) mod_http2: h2 status resource follows latest draft, see
+     http://www.ietf.org/id/draft-benfield-http2-debug-state-01.txt
+     [Stefan Eissing]
+     
+  *) mod_http2: handling graceful shutdown gracefully, e.g. handling existing
+     streams to the end. [Stefan Eissing]
+  
+  *) core: CVE-2016-5387: Mitigate [f]cgi "httpoxy" issues.
+     [Dominic Scheirlinck <dominic vendhq.com>, Yann Ylavic]
+
+  *) mod_proxy_{http,ajp,fcgi}: don't reuse backend connections with data
+     available before the request is sent.  PR 57832.  [Yann Ylavic]
+
+  *) mod_proxy_balancer: Prevent redirect loops between workers within a
+     balancer by limiting the number of redirects to the number balancer
+     members. PR 59864 [Ruediger Pluem]
+
+  *) mod_proxy: Correctly consider error response codes by the backend when
+     processing failonstatus. PR 59869 [Ruediger Pluem]
+
+  *) mod_dav: Add dav_get_provider_name() function to obtain the name
+     of the provider from mod_dav.  [Graham Leggett]
+
+  *) mod_dav: Add support for childtags to dav_error.
+     [Jari Urpalainen <jari.urpalainen nokia.com>]
+
+>>>>>>> .merge-right.r1769587
   *) mod_proxy_fcgi: Fix 2.4.23 breakage for mod_rewrite per-dir and query 
      string showing up in SCRIPT_FILENAME. PR59815
 
@@ -183,7 +294,7 @@ Changes with Apache 2.4.20
   *) mod_proxy_express: Fix possible use of DB handle after close.  PR 59230.
      [Petr <pgajdos suse.cz>]
 
-  *) core/util_script: relax alphanumeric filter of enviroment variable names
+  *) core/util_script: relax alphanumeric filter of environment variable names
      on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al.
      unadulterated in 64 bit versions of Windows. PR 46751.
      [John <john leineweb de>]
@@ -460,7 +571,7 @@ Changes with Apache 2.4.18
      fixes crash on a request that did not produce any response.
      [Stefan Eissing]
 
-  *) mod_http2: trailers are sent after reponse body if set in request_rec
+  *) mod_http2: trailers are sent after response body if set in request_rec
      trailers_out before the end-of-request bucket is sent through the 
      output filters. [Stefan Eissing]
 
@@ -816,7 +927,7 @@ Changes with Apache 2.4.13 (not released
      [Yann Ylavic]
 
   *) mod_proxy_connect/wstunnel: If both client and backend sides get readable
-     at the same time, don't lose errors occuring while forwarding on the first
+     at the same time, don't lose errors occurring while forwarding on the first
      side when none occurs next on the other side, and abort.  [Yann Ylavic]
 
   *) mod_rewrite: Improve relative substitutions in per-directory/htaccess
@@ -969,7 +1080,7 @@ Changes with Apache 2.4.11 (not released
      the URL parameter interpolates to an empty string. PR 56603.
      [<ajprout hotmail.com>]
 
-  *) core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts. 
+  *) core: Fix -D[efined] or <Define>[d] variables lifetime across restarts. 
      PR 57328.  [Armin Abfalterer <a.abfalterer gmail.com>, Yann Ylavic].
 
   *) mod_proxy: Preserve original request headers even if they differ
@@ -1578,7 +1689,7 @@ Changes with Apache 2.4.7
      instead of an explicit cn=* filter. [David Hawes <dhawes vt.edu>]
 
   *) ab: Add wait time, fix processing time, and output write errors only if
-     they occured. [Christophe Jaillet]
+     they occurred. [Christophe Jaillet]
 
   *) worker MPM: Don't forcibly kill worker threads if the child process is
      exiting gracefully.  [Oracle Corporation]
@@ -1591,7 +1702,7 @@ Changes with Apache 2.4.7
      [Chris Darroch]
 
   *) ab: Add a new -l parameter in order not to check the length of the responses.
-     This can be usefull with dynamic pages.
+     This can be useful with dynamic pages.
      PR9945, PR27888, PR42040 [<ccikrs1 cranbrook edu>]
 
   *) Suppress formatting of startup messages written to the console when
@@ -1972,7 +2083,7 @@ Changes with Apache 2.4.5
      request information to the request_rec structure. [Daniel Gruno]
 
   *) mod_lua: Add a server scope for Lua states, which creates a pool of
-     states with managable minimum and maximum size. [Daniel Gruno]
+     states with manageable minimum and maximum size. [Daniel Gruno]
 
   *) mod_lua: Add new directive, LuaMapHandler, for dynamically mapping
      URIs to Lua scripts and functions using regular expressions.
@@ -2025,7 +2136,7 @@ Changes with Apache 2.4.4
   *) mod_slotmem_shm: Fix mistaken reset of num_free for restored shm.
      [Jim Jagielski]
 
-  *) mod_proxy: non-existance of byrequests is not an immediate error.
+  *) mod_proxy: non-existence of byrequests is not an immediate error.
      [Jim Jagielski]
 
   *) mod_proxy_balancer: Improve output of balancer-manager (re: Drn,
@@ -2967,7 +3078,7 @@ Changes with Apache 2.3.14
      binary needs PCRE. [Rainer Jung]
 
   *) configure: tolerate dependency checking failures for modules if
-     they have been enabled implicitely. [Rainer Jung]
+     they have been enabled implicitly. [Rainer Jung]
 
   *) configure: Allow to specify module specific custom linker flags via
      the MOD_XXX_LDADD variables. [Rainer Jung]
@@ -3073,7 +3184,7 @@ Changes with Apache 2.3.13
      state after a timeout when discarding a request body. PR 51103.
      [Stefan Fritsch]
 
-  *) core: Add various file existance test operators to ap_expr.
+  *) core: Add various file existence test operators to ap_expr.
      [Stefan Fritsch]
 
   *) mod_proxy_express: New mass reverse-proxy switch extension for
@@ -4349,7 +4460,7 @@ Changes with Apache 2.3.2
 
   *) mod_mime_magic: Fix detection of compressed content. [Rainer Jung]
 
-  *) mod_negotiation: Escape pathes of filenames in 406 responses to avoid
+  *) mod_negotiation: Escape paths of filenames in 406 responses to avoid
      HTML injections and HTTP response splitting.  PR 46837.
      [Geoff Keating <geoffk apple.com>]
 

Modified: httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/CMakeLists.txt?rev=1769588&r1=1769587&r2=1769588&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/CMakeLists.txt (original)
+++ httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/CMakeLists.txt Mon Nov 14 10:26:31 2016
@@ -387,7 +387,7 @@ SET(mod_http2_extra_sources
   modules/http2/h2_from_h1.c         modules/http2/h2_h2.c
   modules/http2/h2_bucket_beam.c
   modules/http2/h2_mplx.c            modules/http2/h2_push.c
-  modules/http2/h2_request.c         modules/http2/h2_response.c
+  modules/http2/h2_request.c         modules/http2/h2_headers.c
   modules/http2/h2_session.c         modules/http2/h2_stream.c 
   modules/http2/h2_switch.c          modules/http2/h2_ngn_shed.c 
   modules/http2/h2_task.c            modules/http2/h2_util.c

Modified: httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/STATUS?rev=1769588&r1=1769587&r2=1769588&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/STATUS (original)
+++ httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/STATUS Mon Nov 14 10:26:31 2016
@@ -113,17 +113,16 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
-  *) core: CVE-2016-5387: Mitigate [f]cgi "httpoxy" issues
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?rev=1753228&view=rev
-         http://svn.apache.org/viewvc?rev=1753229&view=rev
-      Backport version for 2.4.x of patch:
-         Trunk version of patch works (modulo CHANGES)
-      +1: wrowe, jim
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) core: avoid adding multiple subrequest filters when there are nested 
+     subrequests.  PR58292
+     trunk patch:  http://svn.apache.org/r1698334
+     2.4.x patch:  trunk works modulo CHANGES
+     +1:  covener, jim, jchampion
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -135,22 +134,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: trawick
      ylavic: there may be missing bits, see thread for commit r1736510.
 
-  *) mod_dav: Add support for childtags to dav_error.
-     trunk patch: http://svn.apache.org/r1746207
-     2.4.x: trunk works modulo CHANGES/MMN
-     +1: minfrin, jim
-
-  *) mod_dav: Add dav_begin_multistatus, dav_send_one_response,
-     dav_finish_multistatus, dav_send_multistatus, dav_handle_err, 
-     dav_failed_proppatch, dav_success_proppatch to mod_dav.h.
-     trunk patch: http://svn.apache.org/r1748047
-     2.4.x: trunk works modulo CHANGES/MMN
-     +1: minfrin, jim
-
   *) core: Drop an invalid Last-Modified header value coming
-     from a FCGI/CGI script instead of replacing it with Unix epoch.
-     Warn the users about Last-Modified header value replacements and
-     improved handling of non-GMT datestr.
+     from a (F)CGI script instead of replacing it with Unix epoch.
+     Warn the users about Last-Modified header value replacements
+     and violations of the RFC.
      trunk patch: http://svn.apache.org/r1748379
                   http://svn.apache.org/r1750747
                   http://svn.apache.org/r1750749
@@ -158,71 +145,94 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1751138
                   http://svn.apache.org/r1751139
                   http://svn.apache.org/r1751147
-     2.4.x: trunk patches works (final view http://apaste.info/9v3)
-     The last revision has been discussed in dev@ and submitted by Yann.
-     Tested the code with a simple PHP script returning different Last-Modified
-     headers (GMT now, GMT now Europe/Paris, GMT tomorrow, GMT yesterday).
-     +1: elukey, jchampion
-
-  *) ab: Set the Server Name Indication (SNI) extension on outgoing TLS
-     connections (unless -I is specified), according to the Host header (if
-     any) or the requested URL's hostname otherwise.
-     trunk patch: http://svn.apache.org/r1750854
-                  http://svn.apache.org/r1750855
-                  http://svn.apache.org/r1750947
-                  http://svn.apache.org/r1750955
-                  http://svn.apache.org/r1750960
-     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-ab_sni.patch
-                  (needed to adapt CHANGES entry since r1750854)
-     +1: ylavic, covener
+                  http://svn.apache.org/r1757818
+     2.4.x: trunk patches work, final view:
+            http://home.apache.org/~elukey/httpd-2.4.x-core-last_modified_tz_logging.patch
+     The problem has been discussed in dev@ extensively but we did not reach a common
+     agreement about how to proceed in the long term. While we wait, I would really like
+     to introduce useful logs for the users (the starting point of this change was a users@
+     email thread). If this is not the right way to go I will move the patch to other
+     sections of STATUS (stalled or being worked).
+     The code has been tested with a simple PHP script returning different Last-Modified
+     headers (GMT now, GMT now Europe/Paris, GMT tomorrow, GMT yesterday, PST now).
+     +1: elukey
 
   *) CMake: fix various issues for Windows/Visual Studio build environments.
      PR59685.
      trunk patch: http://svn.apache.org/r1752331
                   http://svn.apache.org/r1752332
                   http://svn.apache.org/r1752333
-     +1: jchampion
+     +1: jchampion, jim (by inspection)
 
-  *) mod_proxy_fcgi: read the whole FCGI response even when the content has
-     not been modified (HTTP 304) to avoid subsequent bogus reads and
-     confusing error messages logged.
-     trunk patch: http://svn.apache.org/r1752347
-     2.4.x patch: trunk works
-     +1 elukey
+  *) mod_ssl: Fix quick renegotiation (OptRenegotiaton) with no intermediate
+     in the client certificate chain.  PR 55786.
+     trunk patch: http://svn.apache.org/r1756542
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, icing (by inspectin)
+
+  *) mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,
+     allowing per backend TLS configuration.
+     trunk patch: http://svn.apache.org/r1740928
+                  http://svn.apache.org/r1740960
+                  http://svn.apache.org/r1740967
+                  http://svn.apache.org/r1740987
+                  http://svn.apache.org/r1740998
+                  http://svn.apache.org/r1742697
+                  http://svn.apache.org/r1756976
+     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1740928_and_co.patch
+     +1: ylavic
 
-  *) autoconf: minor cleanup and removal of some dead code.
-     trunk patch: http://svn.apache.org/r1753315
-                  http://svn.apache.org/r1753316
-     +1: jchampion
+  *) Fix warnings with new compilers, warnings treated as error
+     in maintainer-mode, standard c-89 is enforced
+     trunk patch: http://svn.apache.org/r1702948
+                  http://svn.apache.org/r1759415
+     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1702948_and_co.patch
+     +1: ylavic, jorton, 
+     jchampion: r1702948 doesn't quite work as advertised. -Werror is never
+                added to CFLAGS because when combined with -Wstrict-prototypes,
+                the AC_LANG_PROGRAM won't compile (it uses a bare main()).
+     ylavic: Maybe the -Werror case could be handled later, for now this series
+             avoids a lot of "warning: 'aplog_module_index' defined but not
+             used [-Wunused-const-variable=]" thanks to AP_MAYBE_UNUSED.
+     jchampion: Fine by me. I just think the dead code should be removed from
+                the backport in the meantime, so people don't have a false sense
+                of security.
+
+  *) mod_cache: Bring up-to-date w/ trunk.
+     trunk patch:
+        try to use the key of a possible open but stale cache entry (PR 50317)
+            http://svn.apache.org/r1597533
+        socache_mc_store: Pass through expiration time.
+            http://svn.apache.org/r1649491
+        Preserve the Content-Type in case of 304 response
+            http://svn.apache.org/r1665216
+        Use the actual URI path and query-string (PR 21935)
+            http://svn.apache.org/r1756553
+            http://svn.apache.org/r1756631
+        better s-maxage support
+            http://svn.apache.org/r1726675
+            http://svn.apache.org/r1718496
+            http://svn.apache.org/r1718476
+        Rename ap_casecmpstr[n]() to ap_cstr_casecmp[n](), update with APR doxygen
+            http://svn.apache.org/r1747469 
+     2.4.x patch: http://home.apache.org/~jim/patches/httpd-2.4-cache.patch.txt
+     +1: jim, ylavic
+     ylavic: r1756553 and r1649491 have a CHANGES entry.
 
-  *) mod_proxy_fcgi: avoid loops serving proxied error documents.
-     trunk patch: http://svn.apache.org/r1753167
+  *) mod_socache_memcache: Provide memcache STATs to mod_status
+     trunk patch: http://svn.apache.org/r1768245
      2.4.x patch: trunk works
-     +1: elukey
+     +1: jim
+
+  *) Remove unnecessary apr_table_do() function casts.
+     trunk patch: http://svn.apache.org/r1769192
+     2.4.x patch: trunk works
+     +1: jchampion, rpluem
 
-  *) mod_proxy: Correctly consider error response codes by the backend when
-     processing failonstatus. PR 59869
-      Trunk version of patch:
-         http://svn.apache.org/r1753592
-      Backport version for 2.4.x of patch:
-         Trunk version of patch works (modulo CHANGES)
-      +1: rpluem, jim
-
-  *) mod_proxy_balancer: Prevent redirect loops between workers within a
-     balancer by limiting the number of redirects to the number balancer
-     members. PR 59864
-      Trunk version of patch:
-         http://svn.apache.org/r1753594
-      Backport version for 2.4.x of patch:
-         Trunk version of patch works (modulo CHANGES)
-      +1: rpluem, jim
-
-  *) mod_http: Add the HEAD method to the lookup hash for completeness.
-      Trunk version of patch:
-         http://svn.apache.org/r1753257
-      Backport version for 2.4.x of patch:
-         Trunk version of patch works
-      +1: wrowe
+  *) ssl: clear the error queue before SSL_read/write/accept(). PR60223
+     trunk patch: http://svn.apache.org/r1769332
+     2.4.x patch: https://home.apache.org/~jchampion/patches/2.4.x-ssl-error-queue.patch
+     +1: jchampion, rpluem
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED
@@ -280,6 +290,20 @@ PATCHES/ISSUES THAT ARE BEING WORKED
      minfrin: Yes, as you can see in the patch everything applies only
      if APR_XML_X2T_PARSED is defined, and the patch was tested with
      both apr-util v1.6 and apr-util v1.5.
+     -1: jorton, breaks binary backwards compat per dev@ discuss
+         msgid <20160902120654.GA12674@redhat.com>
+         (& also, making the structure change with apr-util version
+         means it breaks binary compat across an apr-util upgrade?)
+
+  * mod_auth_digest: Reduce severity from NOTICE to DEBUG this 
+    once-per-restart msg (I guess the concern was that the RNG
+    could block after this message)
+
+      AH01757: generating secret for digest authentication ...
+
+    trunk patch: This was fixed in trunk as a trivial part of http://svn.apache.org/r1492395
+    2.4.x patch: Just change the loglevel to DEBUG.
+    +1 covener
 
 PATCHES/ISSUES THAT ARE STALLED
 
@@ -301,7 +325,7 @@ PATCHES/ISSUES THAT ARE STALLED
      +1: jkaluza
      +1: covener w/ doc or code to fix syntax (providername:providerarg not supported like syslog or socacheproviders, 
                  needs 2 args which is not valid in ErrorLog manual)
-     trawick: nit: fix "writing" in "/* NULL if we are writting to syslog */"
+     trawick: nit: fix "writing" in "/* NULL if we are writing to syslog */"
               (sorry, haven't finished reviewing completely)
      jim: What is the status of this??
 
@@ -362,7 +386,7 @@ PATCHES/ISSUES THAT ARE STALLED
      +1: jkaluza
 
   * mod_proxy: Ensure network errors detected by the proxy are returned as
-    504 Gateway Timout as opposed to 502 Bad Gateway
+    504 Gateway Timeout as opposed to 502 Bad Gateway
     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1480058
     2.4.x patch: trunk patch works modulo CHANGES
     +1:
@@ -409,7 +433,7 @@ PATCHES/ISSUES THAT ARE STALLED
           of described indirectly in a sample?
           Why are these new samples added to the install without three
           votes?  (I didn't veto it; put your name next to the two
-          existing ones and I'll be satisified that enough people
+          existing ones and I'll be satisfied that enough people
           considered this addition as an appropriate solution for a
           real httpd usability problem.)
      wrowe: I'd agree with trawick, and suggest that these scripts can begin

Modified: httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/acinclude.m4?rev=1769588&r1=1769587&r2=1769588&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/acinclude.m4 (original)
+++ httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/acinclude.m4 Mon Nov 14 10:26:31 2016
@@ -118,13 +118,6 @@ AC_DEFUN([APACHE_GEN_MAKEFILES],[
   $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES
 ])
 
-dnl ## APACHE_OUTPUT(file)
-dnl ## adds "file" to the list of files generated by AC_OUTPUT
-dnl ## This macro can be used several times.
-AC_DEFUN([APACHE_OUTPUT], [
-  APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1"
-])
-
 dnl
 dnl APACHE_TYPE_RLIM_T
 dnl

Modified: httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/configure.in?rev=1769588&r1=1769587&r2=1769588&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/configure.in (original)
+++ httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/configure.in Mon Nov 14 10:26:31 2016
@@ -158,7 +158,9 @@ else
    ifdef([APR_FIND_APU], [
      APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 
                   1, ${apr_major_version})
-   ], [apu_found=no])
+   ], [apu_found=no
+      AC_MSG_NOTICE([APR-util 1.x not supported with APR 1.x])
+      ])
 fi
 
 if test "$apu_found" = "no"; then
@@ -862,6 +864,6 @@ AC_SUBST(ap_make_delimiter)
 dnl Ensure that docs/conf is created.
 test -d docs/conf||$mkdir_p docs/conf
 
-AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf docs/conf/extra/proxy-html.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config_vars.sh,[true],[
-  APACHE_GEN_MAKEFILES
-])
+AC_CONFIG_FILES(docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf docs/conf/extra/proxy-html.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config_vars.sh)
+AC_CONFIG_COMMANDS([default], [true], [APACHE_GEN_MAKEFILES])
+AC_OUTPUT

Modified: httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/conf/httpd.conf.in?rev=1769588&r1=1769587&r2=1769588&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/branches/2.4.x-openssl-1.1.0-compat/docs/conf/httpd.conf.in Mon Nov 14 10:26:31 2016
@@ -268,6 +268,15 @@ LogLevel warn
     Require all granted
 </Directory>
 
+<IfModule headers_module>
+    #
+    # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
+    # backend servers which have lingering "httpoxy" defects.
+    # 'Proxy' request header is undefined by the IETF, not listed by IANA
+    #
+    RequestHeader unset Proxy early
+</IfModule>
+
 <IfModule mime_module>
     #
     # TypesConfig points to the file containing the list of mappings from



Mime
View raw message