Merging upstream version 2.4.59.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 49 insertions, 0 deletions

diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map
index f2e3e5b..19befc8 100644
--- a/docs/manual/convenience.map
+++ b/docs/manual/convenience.map
@@ -166,13 +166,17 @@ cgivar	mod/core.html#cgivar
 charsetdefault	mod/mod_charset_lite.html#charsetdefault
 charsetoptions	mod/mod_charset_lite.html#charsetoptions
 charsetsourceenc	mod/mod_charset_lite.html#charsetsourceenc
+checkbasenamematch	mod/mod_speling.html#checkbasenamematch
 checkcaseonly	mod/mod_speling.html#checkcaseonly
 checkspelling	mod/mod_speling.html#checkspelling
 chrootdir	mod/mod_unixd.html#chrootdir
 contentdigest	mod/core.html#contentdigest
 cookiedomain	mod/mod_usertrack.html#cookiedomain
 cookieexpires	mod/mod_usertrack.html#cookieexpires
+cookiehttponly	mod/mod_usertrack.html#cookiehttponly
 cookiename	mod/mod_usertrack.html#cookiename
+cookiesamesite	mod/mod_usertrack.html#cookiesamesite
+cookiesecure	mod/mod_usertrack.html#cookiesecure
 cookiestyle	mod/mod_usertrack.html#cookiestyle
 cookietracking	mod/mod_usertrack.html#cookietracking
 coredumpdirectory	mod/mpm_common.html#coredumpdirectory
@@ -240,6 +244,8 @@ filterdeclare	mod/mod_filter.html#filterdeclare
 filterprotocol	mod/mod_filter.html#filterprotocol
 filterprovider	mod/mod_filter.html#filterprovider
 filtertrace	mod/mod_filter.html#filtertrace
+flushmaxpipelined	mod/core.html#flushmaxpipelined
+flushmaxthreshold	mod/core.html#flushmaxthreshold
 forcelanguagepriority	mod/mod_negotiation.html#forcelanguagepriority
 forcetype	mod/core.html#forcetype
 forensiclog	mod/mod_log_forensic.html#forensiclog
@@ -255,6 +261,8 @@ h2maxworkeridleseconds	mod/mod_http2.html#h2maxworkeridleseconds
 h2maxworkers	mod/mod_http2.html#h2maxworkers
 h2minworkers	mod/mod_http2.html#h2minworkers
 h2moderntlsonly	mod/mod_http2.html#h2moderntlsonly
+h2outputbuffering	mod/mod_http2.html#h2outputbuffering
+h2padding	mod/mod_http2.html#h2padding
 h2push	mod/mod_http2.html#h2push
 h2pushdiarysize	mod/mod_http2.html#h2pushdiarysize
 h2pushpriority	mod/mod_http2.html#h2pushpriority
@@ -351,6 +359,7 @@ luahookfixups	mod/mod_lua.html#luahookfixups
 luahookinsertfilter	mod/mod_lua.html#luahookinsertfilter
 luahooklog	mod/mod_lua.html#luahooklog
 luahookmaptostorage	mod/mod_lua.html#luahookmaptostorage
+luahookpretranslate	mod/mod_lua.html#luahookpretranslate
 luahooktranslatename	mod/mod_lua.html#luahooktranslatename
 luahooktypechecker	mod/mod_lua.html#luahooktypechecker
 luainherit	mod/mod_lua.html#luainherit
@@ -373,25 +382,43 @@ maxrequestworkers	mod/mpm_common.html#maxrequestworkers
 maxspareservers	mod/prefork.html#maxspareservers
 maxsparethreads	mod/mpm_common.html#maxsparethreads
 maxthreads	mod/mpm_netware.html#maxthreads
+mdactivationdelay	mod/mod_md.html#mdactivationdelay
 mdbaseserver	mod/mod_md.html#mdbaseserver
 mdcachallenges	mod/mod_md.html#mdcachallenges
 mdcertificateagreement	mod/mod_md.html#mdcertificateagreement
 mdcertificateauthority	mod/mod_md.html#mdcertificateauthority
+mdcertificatecheck	mod/mod_md.html#mdcertificatecheck
+mdcertificatefile	mod/mod_md.html#mdcertificatefile
+mdcertificatekeyfile	mod/mod_md.html#mdcertificatekeyfile
+mdcertificatemonitor	mod/mod_md.html#mdcertificatemonitor
 mdcertificateprotocol	mod/mod_md.html#mdcertificateprotocol
+mdcertificatestatus	mod/mod_md.html#mdcertificatestatus
+mdchallengedns01	mod/mod_md.html#mdchallengedns01
+mdcontactemail	mod/mod_md.html#mdcontactemail
 mddrivemode	mod/mod_md.html#mddrivemode
+mdexternalaccountbinding	mod/mod_md.html#mdexternalaccountbinding
 mdhttpproxy	mod/mod_md.html#mdhttpproxy
 mdmember	mod/mod_md.html#mdmember
 mdmembers	mod/mod_md.html#mdmembers
+mdmessagecmd	mod/mod_md.html#mdmessagecmd
 mdmuststaple	mod/mod_md.html#mdmuststaple
 mdnotifycmd	mod/mod_md.html#mdnotifycmd
 mdomain	mod/mod_md.html#mdomain
 mdomainset	mod/mod_md.html#mdomainset
 mdportmap	mod/mod_md.html#mdportmap
 mdprivatekeys	mod/mod_md.html#mdprivatekeys
+mdrenewmode	mod/mod_md.html#mdrenewmode
 mdrenewwindow	mod/mod_md.html#mdrenewwindow
 mdrequirehttps	mod/mod_md.html#mdrequirehttps
+mdserverstatus	mod/mod_md.html#mdserverstatus
+mdstapleothers	mod/mod_md.html#mdstapleothers
+mdstapling	mod/mod_md.html#mdstapling
+mdstaplingkeepresponse	mod/mod_md.html#mdstaplingkeepresponse
+mdstaplingrenewwindow	mod/mod_md.html#mdstaplingrenewwindow
 mdstoredir	mod/mod_md.html#mdstoredir
+mdwarnwindow	mod/mod_md.html#mdwarnwindow
 memcacheconnttl	mod/mod_socache_memcache.html#memcacheconnttl
+mergeslashes	mod/core.html#mergeslashes
 mergetrailers	mod/core.html#mergetrailers
 metadir	mod/mod_cern_meta.html#metadir
 metafiles	mod/mod_cern_meta.html#metafiles
@@ -419,6 +446,7 @@ protocolecho	mod/mod_echo.html#protocolecho
 protocols	mod/core.html#protocols
 protocolshonororder	mod/core.html#protocolshonororder
 proxy	mod/mod_proxy.html#proxy
+proxy100continue	mod/mod_proxy.html#proxy100continue
 proxyaddheaders	mod/mod_proxy.html#proxyaddheaders
 proxybadheader	mod/mod_proxy.html#proxybadheader
 proxyblock	mod/mod_proxy.html#proxyblock
@@ -469,13 +497,17 @@ proxysourceaddress	mod/mod_proxy.html#proxysourceaddress
 proxystatus	mod/mod_proxy.html#proxystatus
 proxytimeout	mod/mod_proxy.html#proxytimeout
 proxyvia	mod/mod_proxy.html#proxyvia
+proxywebsocketfallbacktoproxyhttp	mod/mod_proxy_wstunnel.html#proxywebsocketfallbacktoproxyhttp
 qualifyredirecturl	mod/core.html#qualifyredirecturl
+readbuffersize	mod/core.html#readbuffersize
 readmename	mod/mod_autoindex.html#readmename
 receivebuffersize	mod/mpm_common.html#receivebuffersize
 redirect	mod/mod_alias.html#redirect
 redirectmatch	mod/mod_alias.html#redirectmatch
 redirectpermanent	mod/mod_alias.html#redirectpermanent
 redirecttemp	mod/mod_alias.html#redirecttemp
+redisconnpoolttl	mod/mod_socache_redis.html#redisconnpoolttl
+redistimeout	mod/mod_socache_redis.html#redistimeout
 reflectorheader	mod/mod_reflector.html#reflectorheader
 regexdefaultoptions	mod/core.html#regexdefaultoptions
 registerhttpmethod	mod/core.html#registerhttpmethod
@@ -548,6 +580,7 @@ sessiondbdselectlabel	mod/mod_session_dbd.html#sessiondbdselectlabel
 sessiondbdupdatelabel	mod/mod_session_dbd.html#sessiondbdupdatelabel
 sessionenv	mod/mod_session.html#sessionenv
 sessionexclude	mod/mod_session.html#sessionexclude
+sessionexpiryupdateinterval	mod/mod_session.html#sessionexpiryupdateinterval
 sessionheader	mod/mod_session.html#sessionheader
 sessioninclude	mod/mod_session.html#sessioninclude
 sessionmaxage	mod/mod_session.html#sessionmaxage
@@ -639,6 +672,7 @@ sslverifyclient	mod/mod_ssl.html#sslverifyclient
 sslverifydepth	mod/mod_ssl.html#sslverifydepth
 startservers	mod/mpm_common.html#startservers
 startthreads	mod/mpm_common.html#startthreads
+stricthostcheck	mod/core.html#stricthostcheck
 substitute	mod/mod_substitute.html#substitute
 substituteinheritbefore	mod/mod_substitute.html#substituteinheritbefore
 substitutemaxlinelength	mod/mod_substitute.html#substitutemaxlinelength
@@ -648,6 +682,21 @@ threadlimit	mod/mpm_common.html#threadlimit
 threadsperchild	mod/mpm_common.html#threadsperchild
 threadstacksize	mod/mpm_common.html#threadstacksize
 timeout	mod/core.html#timeout
+tlscertificate	mod/mod_tls.html#tlscertificate
+tlsciphersprefer	mod/mod_tls.html#tlsciphersprefer
+tlscipherssuppress	mod/mod_tls.html#tlscipherssuppress
+tlsengine	mod/mod_tls.html#tlsengine
+tlshonorclientorder	mod/mod_tls.html#tlshonorclientorder
+tlsoptions	mod/mod_tls.html#tlsoptions
+tlsprotocol	mod/mod_tls.html#tlsprotocol
+tlsproxyca	mod/mod_tls.html#tlsproxyca
+tlsproxyciphersprefer	mod/mod_tls.html#tlsproxyciphersprefer
+tlsproxycipherssuppress	mod/mod_tls.html#tlsproxycipherssuppress
+tlsproxyengine	mod/mod_tls.html#tlsproxyengine
+tlsproxymachinecertificate	mod/mod_tls.html#tlsproxymachinecertificate
+tlsproxyprotocol	mod/mod_tls.html#tlsproxyprotocol
+tlssessioncache	mod/mod_tls.html#tlssessioncache
+tlsstrictsni	mod/mod_tls.html#tlsstrictsni
 traceenable	mod/core.html#traceenable
 transferlog	mod/mod_log_config.html#transferlog
 typesconfig	mod/mod_mime.html#typesconfig