[apache2] 02/05: Merge branch 'upstream'

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit 16f6fe61cdce87c58ec4634a8f82962bf049080f
Merge: 3047967 f797133
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Jul 16 10:15:46 2017 +0200

    Merge branch 'upstream'

 CHANGES                             |  73 ++++-
 build/rpm/httpd.spec.in             |   1 +
 configure                           | 550 +++---------------------------------
 docs/manual/howto/http2.html.fr     |   8 +-
 docs/manual/mod/core.html.en        |  11 +-
 docs/manual/mod/core.html.fr        |   7 +-
 docs/manual/mod/mod_rewrite.html.fr |   2 -
 docs/manual/style/version.ent       |   2 +-
 httpd.spec                          |   3 +-
 include/ap_release.h                |   2 +-
 modules/aaa/mod_auth_digest.c       |   6 +-
 modules/aaa/mod_authnz_ldap.c       |   4 +
 modules/cache/mod_cache_socache.c   |  21 +-
 modules/http/http_protocol.c        |   6 +-
 modules/http2/h2_conn.c             |  21 +-
 modules/http2/h2_conn.h             |   3 +-
 modules/http2/h2_mplx.c             |  58 ++--
 modules/http2/h2_mplx.h             |   4 +-
 modules/http2/h2_session.c          |   7 +-
 modules/http2/h2_stream.c           |  14 +-
 modules/http2/h2_switch.c           |   8 +
 modules/http2/h2_util.c             | 425 +++++++++++++++++++++++-----
 modules/http2/h2_util.h             |  68 ++++-
 modules/http2/h2_version.h          |   2 +-
 modules/http2/h2_workers.c          |   7 +-
 modules/http2/mod_http2.c           |  12 +
 modules/lua/README                  |   3 +
 modules/lua/config.m4               |  38 +--
 modules/lua/lua_apr.c               |   4 +
 modules/lua/lua_config.c            |   4 +-
 modules/lua/lua_request.c           |  20 +-
 modules/lua/mod_lua.c               |   6 +-
 modules/lua/mod_lua.h               |  18 +-
 modules/mappers/mod_negotiation.c   |  11 +-
 modules/proxy/mod_proxy_fcgi.c      |  32 ---
 server/protocol.c                   |  15 +-
 server/request.c                    |   6 +-
 support/htdigest.c                  |   2 +-
 support/htpasswd.c                  |   2 +-
 39 files changed, 710 insertions(+), 776 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git