released today!

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1708473 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1708185 13f79535-47bb-0310-9956-ffa450edef68

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707982 13f79535-47bb-0310-9956-ffa450edef68

XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707979 13f79535-47bb-0310-9956-ffa450edef68

Xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707891 13f79535-47bb-0310-9956-ffa450edef68

Merge r1707889 from trunk: docs: s/h2_module/http2_module/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707890 13f79535-47bb-0310-9956-ffa450edef68

Fix small typo in new docs.

CTR
Backport of r1707883 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707887 13f79535-47bb-0310-9956-ffa450edef68

wake up

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707832 13f79535-47bb-0310-9956-ffa450edef68

docs nit

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707830 13f79535-47bb-0310-9956-ffa450edef68

And we are 2.4.18-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707774 13f79535-47bb-0310-9956-ffa450edef68

Get ready to tag 2.4.17

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707772 13f79535-47bb-0310-9956-ffa450edef68

add nghttp2 and libxml2 stuff to NOTICE.txt & COPYRIGHT.txt

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707641 13f79535-47bb-0310-9956-ffa450edef68

Xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707632 13f79535-47bb-0310-9956-ffa450edef68

Add event in mpm docs where currently only
worker is mentioned. Existing worker text
applies to event without changes.

Thanks to Mathijs Schmittmann.

CTR
Backport of r1707626 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707631 13f79535-47bb-0310-9956-ffa450edef68

Sort MPMs given in modulelist uniformly, list
most important or common ones first.

CTR
Backport of r1707627 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707629 13f79535-47bb-0310-9956-ffa450edef68

Backport  r1705791

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707612 13f79535-47bb-0310-9956-ffa450edef68

merge r1707591
remove conf/extra/http-h2.conf.in from install filelist

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707592 13f79535-47bb-0310-9956-ffa450edef68

Backported.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707557 13f79535-47bb-0310-9956-ffa450edef68

r1678763 | ylavic | 2015-05-11 16:53:34 +0200 (Mon, 11 May 2015) | 7 lines

mod_proxy: only cleanup the socket for a connection asked to be closed but
whose address can still be reused.

This saves unnecessary socket pool destroy and creation at cleanup and reuse
time, plus the same initialization of conn->pool's associated data which can
be reused in that case.

r1703807 | ylavic | 2015-09-18 12:58:58 +0200 (Fri, 18 Sep 2015) | 5 lines

mod_proxy: don't recyle backend announced "Connection: close" connections.
Failing to do this may lead to a race condition where we send a new request
before the backend really closes the connection (or lost SSL-Alert/FIN make
us think the connection is still alive, until the retransmission).

r1703813 | ylavic | 2015-09-18 13:48:31 +0200 (Fri, 18 Sep 2015) | 1 line

mod_proxy: follow up to r1703807: CHANGES entry.

Submitted by: ylavic
Committed by: ylavic
Reviewed  by: ylavic, rjung, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707556 13f79535-47bb-0310-9956-ffa450edef68

backport of old h2 doc removal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707520 13f79535-47bb-0310-9956-ffa450edef68

backport of trunk:r1707497, fixes nghttp 1.3.x interop, bump version to 1.0.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707511 13f79535-47bb-0310-9956-ffa450edef68

vote, promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707418 13f79535-47bb-0310-9956-ffa450edef68

Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707263 13f79535-47bb-0310-9956-ffa450edef68

Fix commit revision of Rainer's proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707241 13f79535-47bb-0310-9956-ffa450edef68

Update mod_ssl (flush) proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707240 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707195 13f79535-47bb-0310-9956-ffa450edef68

Xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707151 13f79535-47bb-0310-9956-ffa450edef68

Remove mod_h2 docs files forgotten after h2 to
http2 renaming.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707124 13f79535-47bb-0310-9956-ffa450edef68

Add a docs remark about "SSLOptions StdEnvVars"
being not necessary for mod_rewrite
"%{SSL:VARIABLE}" feature and for the mod_ssl
extensions to mod_log_config (%{VARIABLE}x).

Xforms.

CTR
Backport of r1706989 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707123 13f79535-47bb-0310-9956-ffa450edef68

Fix new XML error in mod_subtitute docs.

Followup to r1707039.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707122 13f79535-47bb-0310-9956-ffa450edef68

Agree with comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707121 13f79535-47bb-0310-9956-ffa450edef68

Merge r1684900, r1687539, r1687680, r1688331, r1688339, r1688340, r1688341, r1688343, r1697013, r1697015 from trunk:

mod_substitute: Fix configuraton merge order.
PR 57641 [Marc.Stern]

mod_substitute: follow up r1684900.
Introduce the SubstituteInheritBefore directive to configure the merge order.
This allows to preserve 2.4 and earlier behaviour.

mod_substitute: follow up to r1687539.
Use tristate single inherit_before variable instead of two, according to
wrowe's advices.

mod_substitute: follow up to r1687680.
Fix dir config merger 'over'-write, thanks Bill (again).

Very difficult to read, and therefore was wrong.

Assert that the SubstituteInheritBefore option was explicitly toggled,
and do not default in 2.x to this legacy behavior.

Optimize in all cases that the members are all explicitly initialized.

Useful for 2.2 and 2.4, but trunk will require the subsequent patch.

Increase legibility of the max_line_length behavior, and adjust for
the requirement that all members are initialized explicitly due to
the previous patch.

Net -8 LoC, my usual specialty.

This didn't need to be reinvented; please use established helpers.

mod_substitute: follow up r1688339.
SubstituteInheritBefore is the default in 2.5.x but wasn't for ealier versions.

mod_substitute: follow up r1697013.
Update the doc.
Submitted by: niq, ylavic, ylavic, ylavic, wrowe, wrowe, wrowe, wrowe, ylavic, ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707039 13f79535-47bb-0310-9956-ffa450edef68

Merge r1706918 from trunk:

m4: please any autoconf by quoting AC_DEFUN's names. PR 58126.

Submitted by: olli hauer <ohauer gmx.de>

Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707038 13f79535-47bb-0310-9956-ffa450edef68

Merge r1705983 from trunk:

Fix some style issues on files that can easily be synch'ed with 2.4.x
Submitted by: jailletc36
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707037 13f79535-47bb-0310-9956-ffa450edef68

Merge r1705776 from trunk:

Adjust since we are now in shared mem area

Thx Werror: error: address of array 'balancer->s->sticky' will always evaluate to 'true'

Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707036 13f79535-47bb-0310-9956-ffa450edef68

Merge r1629916 from trunk:

core: follow up to r1629909: ap_daemons_to_start can't be lower than 1 (not 0) for prefork either.
Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707035 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707030 13f79535-47bb-0310-9956-ffa450edef68

Promote one more.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707024 13f79535-47bb-0310-9956-ffa450edef68

Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707023 13f79535-47bb-0310-9956-ffa450edef68

Promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707013 13f79535-47bb-0310-9956-ffa450edef68

Some simple votes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707011 13f79535-47bb-0310-9956-ffa450edef68

this is stalled

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706986 13f79535-47bb-0310-9956-ffa450edef68

vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706985 13f79535-47bb-0310-9956-ffa450edef68

Merge r1706942 from trunk:

fix parameter name in ap_log_rdata C99 macro def.
Via  PR57045

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706984 13f79535-47bb-0310-9956-ffa450edef68

Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706953 13f79535-47bb-0310-9956-ffa450edef68

whoops

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706944 13f79535-47bb-0310-9956-ffa450edef68

propose fix for ap_log_rdata macro def

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706943 13f79535-47bb-0310-9956-ffa450edef68

Propose some m4 (AC_DEFUN) fixes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706923 13f79535-47bb-0310-9956-ffa450edef68

Merge r1706637 from trunk:

Fix logic to limit exported symbols in DSO form of mod_http2.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706722 13f79535-47bb-0310-9956-ffa450edef68

Merge r1706627, r1706640 from trunk:

Support mod_http2 in cmake-based build for Windows.
Leave LoadModule of mod_http2 commented-out by default.

Merge r1706635 from trunk:

mod_http2 larger with 64-bit VS 2012 RelWithDebInfo build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706644 13f79535-47bb-0310-9956-ffa450edef68

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706605 13f79535-47bb-0310-9956-ffa450edef68

XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706603 13f79535-47bb-0310-9956-ffa450edef68

Backport r1706533 to 2.4: Turn 5.1/5.2 order upside down, simplify. This should also (AFAIK) work with Ubuntu/Debian, which has previously been known to fail to compile mod_lua.so

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706534 13f79535-47bb-0310-9956-ffa450edef68

Looks good

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706380 13f79535-47bb-0310-9956-ffa450edef68

update transformations

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706368 13f79535-47bb-0310-9956-ffa450edef68

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706367 13f79535-47bb-0310-9956-ffa450edef68

We still need to flush on read during SSL/TLS (re)negotiation (removes jorton's vote).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706364 13f79535-47bb-0310-9956-ffa450edef68

Add r1688341 to mod_substitute proposal, as noticed by wrowe.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706272 13f79535-47bb-0310-9956-ffa450edef68

r1706028

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706029 13f79535-47bb-0310-9956-ffa450edef68

Merge r1703902 from trunk:

mod_proxy: Fix ProxySourceAddress binding failure with AH00938.  PR 56687.
Proposed by: Arne de Bruijn <apache arbruijn.dds.nl>
Reviewed by: ylavic

Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706028 13f79535-47bb-0310-9956-ffa450edef68

promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706026 13f79535-47bb-0310-9956-ffa450edef68

vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706025 13f79535-47bb-0310-9956-ffa450edef68

mod_ssl backports merged

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706013 13f79535-47bb-0310-9956-ffa450edef68

update transformations

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706012 13f79535-47bb-0310-9956-ffa450edef68

remove svn:mergeinfo property from docs/manual/rewrite/advanced.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706010 13f79535-47bb-0310-9956-ffa450edef68

merge r1703952 from trunk

Support compilation against libssl built with OPENSSL_NO_SSL3,
and change the compiled-in default for SSL[Proxy]Protocol to "all -SSLv3",
in accordance with RFC 7568. PR 58349, PR 57120.

Proposed by: kbrand
Reviewed by: ylavic, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706008 13f79535-47bb-0310-9956-ffa450edef68

merge r1702643 from trunk

Append :!aNULL:!eNULL:!EXP to the cipher string settings,
instead of prepending !aNULL:!eNULL:!EXP: (as was the case in 2.4.7
and later). Enables support for configuring the SUITEB* cipher
strings introduced in OpenSSL 1.0.2. PR 58213.

Apply the same treatment to the "SSLOpenSSLConfCmd CipherString ..." directive.

Proposed by: kbrand
Reviewed by: ylavic, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706007 13f79535-47bb-0310-9956-ffa450edef68

merge r1693792 from trunk

Add support for extracting the msUPN and dnsSRV forms
of subjectAltName entries of type "otherName" into
SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n environment
variables. Addresses PR 58020.

* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_OTHER_*_n entries to the
  environment variables table

* modules/ssl/ssl_engine_vars.c: add support for retrieving the
  SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n variables

* modules/ssl/ssl_util_ssl.c: add parse_otherName_value, which
  currently recognizes the "msUPN" (1.3.6.1.4.1.311.20.2.3) and
  "id-on-dnsSRV" (1.3.6.1.5.5.7.8.7) otherName forms, and
  adapt modssl_X509_getSAN to take an optional otherName form
  argument for the GEN_OTHERNAME case

* modules/ssl/ssl_util_ssl.h: adapt modssl_X509_getSAN prototype

* modules/ssl/mod_ssl.c: register the id-on-dnsSRV otherName form
  OID (1.3.6.1.5.5.7.8.7) in OpenSSL's objects table

Proposed by: kbrand
Reviewed by: ylavic, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706006 13f79535-47bb-0310-9956-ffa450edef68

merge r1674538, r1677143, r1677144, r1677145, r1677146, r1677149, r1677151,
r1677153, r1677154, r1677155, r1677156, r1677159, r1677830, r1677832,
r1677834, r1677835 from trunk

mod_ssl namespacing

Proposed by: kbrand
Reviewed by: ylavic, jorton

mod_ssl namespacing: Rename ssl_util_ssl.h macros from SSL_foo to MODSSL_foo.
For related discussion, see the dev@ thread starting at:
http://mail-archives.apache.org/mod_mbox/httpd-dev/201504.mbox/%3C20150415163613.GC15209%40fintan.stsp.name%3E

mod_ssl namespacing: Rename SSL_init_app_data2_idx, SSL_get_app_data2,
and SSL_set_app_data2 from SSL_* to modssl_*. Update references in
README.dsov.* files. Rename static variable SSL_app_data2_idx to just
app_data2_idx since the symbol is internal to ssl_util_ssl.c.

mod_ssl namespacing: SSL_read_PrivateKey -> modssl_read_privatekey

mod_ssl namespacing: SSL_smart_shutdown -> modssl_smart_shutdown

mod_ssl namespacing: SSL_X509_getBC -> modssl_X509_getBC

mod_ssl namespacing: Make SSL_ASN1_STRING_to_utf8 a static function inside
ssl_util_ssl.c (no callers outside this file). The new static function name
chosen is convert_asn1_to_utf8, based on the assumption that neither SSL_
nor ASN1_ are safe prefixes to use without potential future overlap.

mod_ssl namespacing: Rename SSL_X509_NAME_ENTRY_to_string to
modssl_X509_NAME_ENTRY_to_string.

mod_ssl namespacing: SSL_X509_NAME_to_string -> modssl_X509_NAME_to_string

mod_ssl namespacing: SSL_X509_getSAN -> modssl_X509_getSAN

mod_ssl namespacing: Make SSL_X509_getIDs a static function inside the
file ssl_util_ssl.c (no outside callers). Rename to just getIDs().

mod_ssl namespacing: SSL_X509_match_name -> modssl_X509_match_name

mod_ssl namespacing: SSL_X509_INFO_load_file -> modssl_X509_INFO_load_file

mod_ssl namespacing: Merge SSL_X509_INFO_load_path() into its only caller
ssl_init_proxy_certs() in ssl_engine_init.c. No functional change.
Review by: kbrand

mod_ssl namespacing: Move modssl_X509_INFO_load_file() into ssl_engine_init.c
and make it a static function called load_x509_info().

mod_ssl namespacing: Move SSL_CTX_use_certificate_chain() into ssl_engine_init.c
and make it a static function called use_certificate_chain().

mod_ssl namespacing: Rename SSL_SESSION_id2sz() to modssl_SSL_SESSION_id2sz().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706002 13f79535-47bb-0310-9956-ffa450edef68

Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705996 13f79535-47bb-0310-9956-ffa450edef68

Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705984 13f79535-47bb-0310-9956-ffa450edef68

mod_http2: config.m4: merge r1705257 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705839 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705836 13f79535-47bb-0310-9956-ffa450edef68

Vote for OPENSSL_NO_SSL3 (including default), looks acceptable on dev@.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705831 13f79535-47bb-0310-9956-ffa450edef68

Vote (for Jim too who proposed the backport :).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705829 13f79535-47bb-0310-9956-ffa450edef68

Follow up to r1705751 to pick up a few strays

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705790 13f79535-47bb-0310-9956-ffa450edef68

Follow up to r1705672.
Backport changes that somehow missed the backport process.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705784 13f79535-47bb-0310-9956-ffa450edef68

Backport item

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705777 13f79535-47bb-0310-9956-ffa450edef68

Follow up to r1705492: fix MMN versions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705759 13f79535-47bb-0310-9956-ffa450edef68

http2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705757 13f79535-47bb-0310-9956-ffa450edef68

doccos

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705753 13f79535-47bb-0310-9956-ffa450edef68

Merge r1705749 from trunk:

bye bye mod_h2, hello mod_http2

Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705751 13f79535-47bb-0310-9956-ffa450edef68

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705750 13f79535-47bb-0310-9956-ffa450edef68

note note to t&r

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705747 13f79535-47bb-0310-9956-ffa450edef68

fix validation error

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705746 13f79535-47bb-0310-9956-ffa450edef68

Use r->hostname

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705687 13f79535-47bb-0310-9956-ffa450edef68

oops2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705685 13f79535-47bb-0310-9956-ffa450edef68

oops

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705684 13f79535-47bb-0310-9956-ffa450edef68

mod_h2
Via: svn merge -r10:HEAD https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705682 13f79535-47bb-0310-9956-ffa450edef68

Sync

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1705681 13f79535-47bb-0310-9956-ffa450edef68

Merge r1697855, r1697339, r1696428, r1696266, r1696264, r1695874, r1695727, r1692516, r1692486, r1610674, r1685069, r1693918, r1698116, r1698133, r1694950, r1700968, r1701005, r1701145, r1701178 from trunk:

adding ap_get_protocol(c) which safeguards against NULL returns, for use instead of direct calling ap_run_protocol_get

changed Protocols to let vhosts override servers, removed old H2Engine example from readme

creating ap_array_index in util, forwarding scheme into request processing, enabling SSL vars only when scheme is not http:, delayed connection creation until task worker assignment

removed unnecessary lingering_close and sbh update on end of protocol upgrade handling

introducing ap_array_index in util, used in protocol and mod_h2

fixes existing protocol missing in selection if not explicitly proposed

new directive ProtocolsHonorOrder, added documentation for Protocols feature, changed preference selection and config merging

removed accidental code

new Protocols directive and core API changes to enable protocol switching on HTTP Upgrade or ALPN, implemented in mod_ssl and mod_h2

SECURITY (CVE-2014-0117): Fix a crash in mod_proxy.  In a reverse
proxy configuration, a remote attacker could send a carefully crafted
request which could crash a server process, resulting in denial of
service.

Thanks to Marek Kroemeke working with HP's Zero Day Initiative for
reporting this issue.

* server/util.c (ap_parse_token_list_strict): New function.

* modules/proxy/proxy_util.c (find_conn_headers): Use it here.

* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):
  Send a 400 for a malformed Connection header.

Submitted by: Edward Lu, breser, covener

http, mod_ssl: Introduce and return the 421 (Misdirected Request) status code
for clients requesting a hostname on a reused connection whose SNI (from the
TLS handshake) does not match.
PR 5802.

This allows HTTP/2 clients to fall back to a new connection as per:
https://tools.ietf.org/html/rfc7540#section-9.1.2

Proposed by: Stefan Eissing <stefan eissing.org>
Reviewed by: ylavic

c89

Allowing protocol_propose hooks to be called with offers=NULL, clarifying semantics as proposed by chaosed0@gmail.com

giving ap_array_index a start parameter, adding ap_array_contains

ap_process_request needs exportation for use in mod_h2 on Windows

final final change to the new ap_array_str_* functions after review

changed Protocols default to http/1.1 only, updated documentation, changed ap_select_protocol() to return NULL when no protocol could be agreed upon

mod_ssl: fix compiler warning (bad cast).

improvements in ap_select_protocol(), supplied by yann ylavic
Submitted by: icing, jorton, ylavic, covener, icing, icing, gsmith, icing, icing, ylavic, icing
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705672 13f79535-47bb-0310-9956-ffa450edef68

Note mod_h2 is RTC exception

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705669 13f79535-47bb-0310-9956-ffa450edef68

Merge r1705099, r1705134 from trunk:

Don't count initial handshake I/O when determining the first byte.
PR58454

Submitted By: Konstantin J. Chernov
Committed By: covener

Avoid storing request stuff in r->connection->conn_config to
avoid problems with e.g. write completion.

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705666 13f79535-47bb-0310-9956-ffa450edef68

Merge r1704099 from trunk:

Fix a spurious test where a condition is always true:
      if ((cfg->skipto != NULL) && (ctx->flags | ENC_SKIPTO)) {
                                    ^^^^^^^^^^^^^^^^^^^^^^^

This is apparently harmless because, in 'xml2enc_filter_init', the ENC_SKIPTO bit of 'flags' is set to ENC_SKIPTO if 'skipto' is non-NULL.
Submitted by: jailletc36
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705665 13f79535-47bb-0310-9956-ffa450edef68

Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705655 13f79535-47bb-0310-9956-ffa450edef68

Vote/promote mod_h2, what about "experimental" bits?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705649 13f79535-47bb-0310-9956-ffa450edef68

Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705633 13f79535-47bb-0310-9956-ffa450edef68

propose update

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705629 13f79535-47bb-0310-9956-ffa450edef68

merged current 2.4.x and ap_mmn.h update by minfrin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1705628 13f79535-47bb-0310-9956-ffa450edef68

Compatibility issue?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705618 13f79535-47bb-0310-9956-ffa450edef68