Update mod_deflate mergeinfo:
trunk r1586542 merged in r1911075
trunk r1610501 merged in r1610503

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

fr doc rebuild.

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

fr doc XML files updates.

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

Merged x2.

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

Merge r1915508 from trunk:

* support/htcacheclean.c (list_urls): Continue rather than stopping
  after listing a file for each subdirectory.

PR: 65091
Submitted by: Artem Egorenkov <aegorenkov.91 gmail.com>
Reviewed by: jorton, ylavic, jfclere

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

Merge r1862611, r1877693, r1878703, r1884207 from trunk:

* support/htpasswd.c (usage): Document SHA-256/512 support.

Windows : do not include ap_config_auto.h

* support/htpasswd.c (usage): Fix typo.

Fix misleading crypt vs hash terminology in ht* and dbmmanage tools.

What the htpasswd, htdbm and dbmmanage tools do is hashing passwords, not
encrypting them, so fix the terminology in manpages, docs, --help, comments
and function names.

Submitted by: Michele Preziuso <mpreziuso kaosdynamics.com>, jorton, steffenal, ylavic
Github: closes #408
Reviewed by: jorton, ylavic, jfclere

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

Vote.

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

remove my proposal and vote Joe's one.

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

fr doc rebuild.

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

fr doc XML file update.

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

Merge r1916051, r1916052, r1916053, r1916055, r1916056 from trunk: [CTR for CI changes]

CI: Hopefully fix caching and artifact uploads by creating $JOBID
as a unique key for each job in the matrix, using that as the
cache key and in each artefact upload (otherwise multiple failures
uploading "error_log" overwrite each other).

CI: Enable caching for the rustls install used for mod_tls testing.

CI: Re-enable caching for *fixed* versions of apr/apr-util which
should now work correctly (since the version is in the cache key).

For 1.x branches, CLEAR_CACHE must still be used.

CI tweaks:
- don't install CPAN modules if NO_TEST_FRAMEWORK is set
- remove the workaround for mod_h2 APR build caching which
  should no longer be necessary now caching is fixed
- fix capturing specific perl-framework failures with "TEST -v" mode

Fix regression in r1916055 - don't duplicate logic in _run_linux.sh
from _before_linux.sh in whether the perl-framework is used/needed.

Github: closes #418

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

Propose.

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

Vote.

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

Follow-up to r1825120:

* modules/ssl/ssl_engine_init.c (ssl_init_ca_cert_path): Since
  SSL_add_file_cert_subjects_to_stack() internally replaces the
  comparison callback with one equivalent to
  ssl_init_FindCAList_X509NameCmp, there's no point in using that
  here.
  (ssl_init_FindCAList_X509NameCmp): Removed.

Merges r1825124 from https://svn.apache.org/repos/asf/httpd/httpd/trunk.

Submitted by: jorton

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

PR62229: add CGIScriptTimeout to mod_cgi

add CGIScriptTimeout to mod_cgi, like mod_cgid's CGIDScriptTimeout.

Not addressed: making CGIScriptTimeout name work for either module.

Merges r1828172 from https://svn.apache.org/repos/asf/httpd/httpd/trunk.

Submitted By: Hank Ibell <hwibell gmail.com>
Committed By: covener
Reviewed by: minfrin, ylavic, jfclere

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

mod_ssl: Follow up to r1913815: szCryptoDevice to NULL when !MODSSL_HAVE_ENGINE_API

Latest OpenSSL versions removed the ENGINE API completely, still provide NULL
SSLModConfigRec::szCryptoDevice since it's used outside MODSSL_HAVE_ENGINE_API.

SSLModConfigRec is a private struct, so no MMN change.

* modules/ssl/ssl_private(SSLModConfigRec):
  Provide szCryptoDevice (NULL) even if !MODSSL_HAVE_ENGINE_API.

Merges r1915889 from https://svn.apache.org/repos/asf/httpd/httpd/trunk.

Submitted by: ylavic
Reviewed by: ylavic, jorton, jfclere

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

Accepted.

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

Propose. CMake builds fail withi: "fatal error C1083: Cannot open include file: 'ap_config_auto.h'"

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

votes.

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

Vote.

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

Vote, propose.

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

Propose x1.

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

Done x2.

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

* mod_slotmem_shm: Use ap_os_is_path_absolute() to make it portable.

Reviewed by: jfclere, jorton, covener

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

undo r1915782.

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

Merge r1915400 from trunk:

* mod_slotmem_shm: Use ap_os_is_path_absolute() to make it portable.

Reviewed by: jfclere, jorton, covener

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

Add new PR number for the libxml2 fix.

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

Merge r1825120 from trunk:

* modules/ssl/ssl_engine_init.c (ssl_init_PushCAList): Remove function.
  (ssl_init_ca_cert_path): Use SSL_add_file_cert_subjects_to_stack()
  instead.

[Edit: This does change behaviour: the acceptable client CA list is now
 always be sent in sorted order rather than configured/file order.
 In the case of SSLCACertificatePath and SSLCADNRequestPath, the
 order will be stable rather than non-determistic as previously.]

PR: 61574
Github: closes #406
Reviewed by: jorton, jfclere, covener

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

a few quick votes

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

fr doc rebuild.

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

XML file update.

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

Change my vote the actual proposal refers code that is NOT in trunk.

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

Promote 2, done 1, propose 1.

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

Merge r1915680 from trunk:

Update SSLProxyMachineCertificateFile compat note after r1915679.

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

Merge r1884552 from trunk:

Treat non-leaf certificates present in SSLProxyMachineCertificateFile
the same was as non-leaf certs are in SSLCertificateFile - use them to
build the trusted cert chain for the end-entity (client) cert.

* modules/ssl/ssl_engine_init.c (ssl_init_proxy_certs):
  For any non-leaf certificate present in the configured, trust as
  if used in SSLProxyMachineCertificateChainFile.

Github: closes #403
Reviewed by: jorton, gbechis, jfclere

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

Vote.

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

fr doc rebuild.

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

fr doc XML file update.

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

Vote.

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

Done/propose.

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

Merge r1879591 from trunk:

Check for and use gettid() directly if available; glibc 2.30 and later
provides a wrapper for the system call:

* configure.in: Check for gettid() and define HAVE_SYS_GETTID if
  gettid() is only usable via syscall().

* server/log.c (log_tid): Use gettid() directly if available.

Submitted by: jorton
Reviewed by: jorton, jfclere, gbechis
Github: closes #404

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

vote [skip ci]

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

Done.

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

Merge r1874101, r1913838 from trunk:

fix build with LibreSSL 2.0.7+

PR: 64047

Follow up to r1874101: Axe useless LIBRESSL_VERSION_NUMBER check.

Since the fix to MODSSL_USE_OPENSSL_PRE_1_1_API in r1908537, we are sure that
  !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL
in this block.

Submitted by: gbechis, ylavic
Reviewed by: ylavic, minfrin, jorton

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

Vote, done.

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

Merge r1909450 from trunk:

Make sources build with latest clang version

Submitted by: icing
Reviewed by: minfrin, ylavic, jfclere

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

Done/vote/propose.

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

Vote

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

Merge r1861793, r1862612, r1862724, r1877251, r1907672 from trunk:

Add support for SHA-2 crypt() algorithm in htpasswd.

* configure.in: Detect SHA-2 support in crypt().

* support/passwd_common.h: Define ALG_CRYPT_SHA256, ALG_CRYPT_SHA512,
  include ap_config_auto.h.

* support/htpasswd.c (check_args): Allow -2, -5, -r arguments for
  SHA-256, SHA-256 and rounds options respectively.

* support/passwd_common.c
  (parse_common_options): Parse -2, -5, -r args.
  (mkhash): Generate crypt hash for SHA256/SHA512 algorithms.

Update transform.

* support/htpasswd.c (usage): More usage fixes for SHA-2; describe
  as "secure", leave bcrypt only algorithm described as "very secure".

* support/passwd_common.c (mkhash): Fix salt buffer size for SHA2
  (caught by gcc 10).

configure: Assume crypt() does not support SHA-2 when cross-compiling.

Can be forced with "./configure ap_cv_crypt_sha2=yes ..." still.

* configure.in:
  Give AC_RUN_IFELSE a cross-compiling action, otherwise it fails with:
    configure: error: cannot run test program while cross compiling

Submitted by: jorton, ylavic
Reviewed by: minfrin, ylavic, jorton

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

Propose.

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

Vote.

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

Propose.

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

Propose.

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

Merged x1.

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

Merge r1811831 from trunk:

* server/util_script.c (ap_add_common_vars): Allow mod_env to override
  all system path environment variables, not just PATH.  (The
  behaviour for PATH alone was changed in r965679 for PR 43906.)

Submitted by: jorton
Reviewed by: minfrin, ylavic, jorton

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

Vote, propose.

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

Merge r1915423 from trunk:

fill in empty descriptions from command_rec

[skip ci]

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

Updated typo NWGNUmakefile

dependencies was spelled dependancies.

Submitted by: StevenSedwick <133059415+StevenSedwick@users.noreply.github.com>

(Also applied to trunk)

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

* Comment

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

propose r1915281 for backport

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

Tweak formatting, remove a non-user-visible change.

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

Updated after merged backports.

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

Merge r1914318 from trunk:

mod_ssl: Follow up to r1908537: Fix typo s/MODSSL_USE_ENGINE_API/MODSSL_HAVE_ENGINE_API/

Submitted by: ylavic
Reviewed by: ylavic, minfrin, jorton

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

Merge r1914013 from trunk:

mod_xml2enc: remove dependency on xmlstring header

Submitted by: ttachi <tachihara hotmail.com>
Github: closes #393
Reviewed by: covener, minfrin, jorton

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

Votes.

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

Fix a typo (missing "t")
s/redisribution/redistribution/

PR 67018 [<hanskrentel yahoo.de>]

r1914884 on trunk

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

Fix the authorization types that support expressions.

r1914881 in trunk.

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

fr doc XML file update.

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

Votes.

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

Vote.

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

Vote.

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

Late fix for r1913912, plus comment about new proposal.

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

Update proposal to include r1914281.

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

fr doc rebuild.

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

fr doc XML file ipdate.

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

Update LDAP proposal, reset the vote.

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

Propose.

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

Propose.

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

Vote.

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

xforms

[skip ci]

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

Merge r1914039, r1914040 from trunk:

remove apachehaus

I've read in two places they are no longer providing builds,
and the website is currently down.

[skip ci]

mention httpd.conf and install root dependency

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

add contributor patch for libxml2

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

Resume vote.

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

Update proposal as per recommendation.

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

Backport to v2.4:

   *) core: Fix use after free warning with gcc -fanalyzer.
      trunk patch: http://svn.apache.org/r1892413
      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-use-after-free.patch
      +1: minfrin, ylavic, jorton

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

Backport to 2.4:

   *) Allow mod_dav_fs to tolerate race conditions between PROPFIND and an
      operation which removes a directory/file between apr_dir_read() and
      apr_stat(). Current behaviour is to abort the connection which seems
      inferior to tolerating (and logging) the error.
      trunk patch: http://svn.apache.org/r1910811
      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-tolerant.patch
      +1: minfrin, ylavic, jorton

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

Promote.

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

Suspend vote.

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

Votes.

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

Vote.

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

* Update mergeinfo with merges from r1913907

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

Update proposal with ylavic's fix.

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

More votes.

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

Backport to v2.4:

   *) mod_ldap: HTML-escape data in ldap-status handler
      trunk patch: http://svn.apache.org/r1913855
      2.4.x patch  svn merge -c 1913855 ^/httpd/httpd/trunk .
      +1: covener, minfrin, ylavic

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

Comment.

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

Propose.

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

Add proposal.

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

Vote, promote, comment

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

Vote.

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

Update vote, note need for mmn bump.

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