Merge r1910790, r1918059 from trunk: [CTR for CI changes]

Use 'git clone' rather than 'svn export' in CI scripts.
Drop unused run_svn_export.
Run git clone with -q throughout.

CI: For LDAP tests, switch to using OpenLDAP slapd running on
CentOS Stream 9.

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

propose 1918003 for backport

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

add warning about behavior change

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

3 votes + 1 promotion

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

Propose x1.

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

Vote x1, propose x1. [skip ci]

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1917202 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@1917201 13f79535-47bb-0310-9956-ffa450edef68

xform

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

Merge r1917053 from trunk:

doc recent addition ap_trust_cgilike_cl

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

* Add proposal

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

Propose x1.

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916965 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@1916964 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@1916963 13f79535-47bb-0310-9956-ffa450edef68

Fix occasional pytest failures
in modules/http2/test_800_websockets.py
(test_h2_800_03_not_found and
test_h2_800_05_non_ws_delay_resource) due to
additional RST messages.

Backport of r1916830 from trunk.

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

Update mergeinfo for merged changes.

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

Fix occasional pytest failures
in modules/http2/test_800_websockets.py
(test_h2_800_04_non_ws_resource and
test_h2_800_09b_unsupported) due to
additional RST messages.

Backport of r1916808 from trunk.

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

Fix failing pytest modules/http2/test_712_buffering.py:48.

Do not count lines like "00:12:26.578220 <= Recv data, 0 bytes (0x0)"
(which happen before the final close) as receiving a real chunk.

Backport of r1918606 from trunk.

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

Fix pytest failure when using older nghttp2

Backport of r1916804 from trunk.

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

publishing release httpd-2.4.59

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

add recent mergeinfo

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

Merge r1916771 from trunk:

bail after too many failed reads

Submitted By: icing

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

header validation after content-* are eval'ed

backport r1916770 from trunk
Submitted By: ylavic

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

let httpd handle CL/TE for non-http handlers

backport r1916769 from trunk:
Submitted By: ylavic, covener

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

make update-changes

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

Regenerate docs.

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

Merge r1916129 from trunk (htpasswd docs):

Document SHA-2 support.

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

PR 64339 has been backported and closed.

So remove it from the PATCHES/ISSUES THAT ARE BEING WORKED section.

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

r1881790 has also added the 3rd argument to "ProxyRemoteMatch".

(r1916708 in trunk)

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

Fix a release version in <compatibility> tag.

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

Add <compatibility> note for CGIScriptTimeout.

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

Fix some release versions in <compatibility> tag.

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

Fix some release versions in <compatibility> tag.

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

Add mergeinfo

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

Update copyright year

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

Merged in r1916584.

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

mod_auth_basic: Use unsigned bit flags (otherwise the non-zero value to be used is -1).

Merge r1603863 from trunk.
Submitted by: ylavic
Reviewed by: ylavic, jorton, rpluem
Github: closes #425

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

* Vote and promote

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

Vote.

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

Propose warning fix.

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

Merge in r1916575.

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

mod_ssl: Allow for "SSLCompression off" still when OPENSSL_NO_COMP.

Latest OpenSSL versions have OPENSSL_NO_COMP by default, avoid breaking
existing "SSLCompression off" in configurations since it's a noop.

* modules/ssl/ssl_engine_config.c(ssl_cmd_SSLCompression):
  Don't fail for OPENSSL_NO_COMP if the flag is "off".

Merges r1916561 from ^/httpd/httpd/trunk

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

1x merged, 1x vote+promote.

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

* Vote

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

Propose.

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

Merge r1619448, r1619486, r1895552, r1894152, r1914800 from trunk:

leave a hint while scrolling through inflate() calls

mod_deflate:
- fix signed/unsigned (int/size_t) comparisons,
- add consume_buffer() to factorize code used multiple times,
- cleanup passed brigade (don't rely on next output filters to do it).

* modules/filters/mod_deflate.c (deflate_in_filter): Handle FLUSH in
  the input brigade even if done inflating (ctx->done is true), but
  don't try to flush the inflate stream in that case.  (Caught by
  Coverity)

* modules/filters/mod_deflate.c (deflate_out_filter): Catch
  apr_bucket_read() errors.

mod_deflate: remove filter after seeing EOS

Github: closes #423
Submitted by: covener, ylavic, jorton, Eric Norris <enorris etsy.com>
Reviewed by: jorton, gbechis, ylavic

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

Update CHANGES entries.

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

Vote, promote.

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

Merge r1916133 from trunk:

CI: update actions to v4

Submitted by: Sagar <42873729+SagarCodeCtrl users.noreply.github.com>

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

Merged x2.

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

Merge r1915281 from trunk:

  *) mod_http2: v2.0.26 with the following fixes:
     - Fixed `Date` header on requests upgraded from HTTP/1.1 (h2c). Fixes
       <https://github.com/icing/mod_h2/issues/272>.
     - Fixed small memory leak in h2 header bucket free. Thanks to
       Michael Kaufmann for finding this and providing the fix.

Submitted by: icing
Reviewed by: icing, gbechis, jorton

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

Merge r1884505, r1915625 from trunk:

The Microsoft OOXML format uses xml packaged into a zip file, and has
mimetypes like:

application/vnd.openxmlformats-officedocument.spreadsheetml.sheet

This mimetypes contains 'xml', but is unfortunately not an xml file.

xml2enc processes these files (in particular, when mod_proxy_html is
used), typically resulting in them being corrupted as it seems to
attempt to perform a ISO-8859-1 to UTF-8 conversion on them.

* modules/filters/mod_xml2enc.c (xml2enc_ffunc): Restrict test for XML
  types to matching "+xml".

Submitted by: Joseph Heenan <joseph.heenan fintechlabs.io>, jorton
PR: 64339
Reviewed by: jorton, ylavic, gbechis
Github: closes #410

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

vote [skip ci]

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

Merge r1916396, r1916397 from trunk: [CTR for CI changes]

CI: Try working around recent ASAN failures.
CI: conditional didn't work in r1916396, always apply ASAN workaround.

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

Propose x1.

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

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