oops, we forgot about the glitch with a new log message

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

more mod_proxy_*cgi goodness

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

Merge r1592529 from trunk:

mod_proxy_scgi: Support Unix sockets.

ap_proxy_port_of_scheme(): Support default SCGI port (4000).

Submitted by: trawick
Reviewed/backported by: jim

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

restore argument structure for exec-type SSLPassPhraseDialog
programs, and implement a special merging algorithm for
SSLCertificate[Key]File to emulate the behavior in versions <= 2.4.7

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

Merge r1588853 from trunk:

ssl_stapling_init_cert: do not return success when no responder URI is found
stapling_renew_response: abort early (before apr_uri_parse) if ocspuri is empty

Submitted by: kbrand
Reviewed/backported by: jim

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

Merge r1588851 from trunk:

ssl_callback_TmpDH: for OpenSSL 1.0.2 and later, set the current cert to the
one actually used for the connection before calling SSL_get_privatekey(ssl)

Submitted by: kbrand
Reviewed/backported by: jim

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

Merge r1588704 from trunk:

Fix errors with CacheLock on Windows:

cache_util.c(757): (OS 80)The file exists.  : [client 127.0.0.1:63889]
AH00784: Attempt to obtain a cache lock for stale cached URL failed,
revalidating entry anyway:

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1584430, r1584434 from trunk:

mod_expires: don't add Expires header to error responses (4xx/5xx),
             be they generated or forwarded. PR 55669.

Follow up to r1584430.

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1590437, r1592500 from trunk:

mod_proxy_fcgi: Don't segfault when failing to connect to the backend.

now understood why users haven't reported the segfault (yet) when mod_proxy_fcgi
can't connect to the application

Submitted by: trawick
Reviewed/backported by: jim

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

promotes

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

votes

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

mod_authn_socache: Fix creation of default socache_instance. Fixes crash
                   on startup if default socache_provider is used and
                   AuthnCacheEnable or AuthnCacheProvideFor is used.
                   This problem has been introduced in r1531961.
                   PR 56371.

Submitted by: jkaluza
Reviewed by: ylavic, jim, trawick

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

Votes.

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

Vote for SSLPassPhraseDialog proposal

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

Complete URL in link, comment and typo

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

$ ./test/readbody.sh httpd scgi tcp 10000 100 2>&1 | egrep '(Document Length|Failed requests|Requests per second)'
Document Length:        71453 bytes
Failed requests:        0
Requests per second:    9698.92 [#/sec] (mean)
$ ./test/readbody.sh httpd scgi unix 10000 100 2>&1 | egrep '(Document Length|Failed requests|Requests per second)'
Document Length:        71453 bytes
Failed requests:        0
Requests per second:    10140.24 [#/sec] (mean)
$ ./test/readbody.sh nginx scgi tcp 10000 100 2>&1 | egrep '(Document Length|Failed requests|Requests per second)'
Document Length:        71453 bytes
Failed requests:        0
Requests per second:    3900.32 [#/sec] (mean)
$ ./test/readbody.sh nginx scgi unix 10000 100 2>&1 | egrep '(Document Length|Failed requests|Requests per second)'
Document Length:        71453 bytes
Failed requests:        0
Requests per second:    4300.62 [#/sec] (mean)

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

two simple votes

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

update a mod_proxy_fcgi proposal with an additional tweak to CHANGES

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

vote for SSLOCSPUseRequestNonce proposal

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

r1591401 added to SSLOCSPUseRequestNonce bundle.

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

Add typo fix to mod_cache proposal.

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

Propose mod_cache changes regarding 304 and forwarded headers.

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

Updates.

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

comment

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

Add missing links

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

Correct typo as spoted in a comment in online doc

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

Correct typo as spoted in a comment in online doc

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

Correct typo as spoted in a comment in online doc

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

Correct typo as spoted in a comment in online doc

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

Propose.

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

Correct typo as spoted in a comment in online doc

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

Correct case as spoted in a comment in online doc

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

Correct according to the comments in online doc

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

Add follow up to r1587639 in mod_deflate's reentrance bundle.

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

embarazada is not quite the right word

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

Correct port number in example as spoted in comment in online doc

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

SSLOCSPUseRequestNonce's proposal's 2.4.x patch.

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

KSDSKSDS ****
 ****

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

Updates.

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

propose mod_ssl backwards compat patch, comment

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

s/=/==/ as spotted in comment in online doc

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

Updates.

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

Fix a few things in french translation that were already fixed in trunk.

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

C89 and such

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

Merge 1589413 from trunk:

tweaks to grammar and markup

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

Updates.

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

fix lua_ap_requestbody (bad backport?)

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

Typo in comment (r1588862 in trunk)

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

add two mod_ssl proposals (TmpDH callback, OCSP stapling init)

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

Backport r1588807

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

update CHANGES

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

mod_lua: backport the two parsebody fixes.

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

2.4-only: remove 2.3.9/2.3.10 trivia

Merge r1588747 from trunk:

expr=value updates:
 update RequestHeader syntax,
 add compat to Header and RequestHeader

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

vote/promote

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

propose CacheLock APR_EEXIST/APR_STATUS_IS_EEXIST() bug

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

Merge r1588427 from trunk:

Also clear the error queue before calling SSL_CTX_use_certificate[_chain]_file
(workaround for OpenSSL versions before 0.9.8h, see
https://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=1513).

PR 56410.

Submitted by: kbrand
Reviewed/backported by: jim

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

Merge r1587036, r1587040, r1587053, r1587654 from trunk:

  *) mod_proxy_wstunnel: Don't pool backend websockets connections,
     because we need to handshake every time. PR 55890.
     [Eric Covener]

actually remove mod_reqtimeout, since the util_filter functions involved
only manipulate c->input_filters no matter what we pass. We need to make
copies of c->input_filters after, not before, it skips over reqtimeout.

Note: reqtimeout doesn't really interfere today with normal operation,
but this is misleading/confusing when dealing with other
wstunnel issues.

cleanup wstunnel error handling

Submitted By: covener, ylavic, Edward Lu
Commited By: covener

followup to r1587036.

if backend->close is set too early, proxy_util.c will close it right
away and then blow away the field.

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1543174, r1560367, r1560546, r1560689, r1560979, r1561137, r1561660 from trunk:

Correct logic... if this is a UDS socket, then bypass all
this.

make mod_rewrite and mod_proxy UDS work together...

Adjust url as required, following what we did to r->filename.
Save some cycles when searching...

Tuck away UDS path in request-rec, since worker isn't
thread-safe. Protect from NULL refs.

Reflow logic... pull UDS stuff out

handle leak. thx to Y^2

r->filename should maintain the proxy: prefix for PHP-FPM
Reviewed/backported by: jim

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

Merge r1514255, r1514267 from trunk:

follow-up to r813376:

finish reverting r808965 (ServerTokens set foo)

tweak syntax strings for ServerTokens
Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1546835, r1546836 from trunk:

Follow-up to r1546759: Fix compilation when exception hooks aren't enabled.

avoid duplication of APR_HOOK_LINK invocations

Submitted by: trawick
Reviewed/backported by: jim

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

ipromote

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

ivote

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

Vote for r1561385 and promote uds-rewrite.

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

propose mod_ssl SSLCertificateFile workaround for OpenSSL < 0.9.8h

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

Merge r1585090 from trunk:

Bring SNI behavior into better conformance with RFC 6066:

- no longer send a warning-level unrecognized_name(112) alert
  when no matching vhost is found (PR 56241)

- at startup, only issue warnings about IP/port conflicts and name-based
  SSL vhosts when running with an OpenSSL without TLS extension support
  (almost 5 years after SNI was added to 2.2.x, the
  "[...] only work for clients with TLS server name indication support"
  warning feels obsolete)

Proposed by: kbrand
Reviewed by: jorton, ylavic

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

Add missing entry as suggested on dev list.

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

Grammar

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

Vote for build breakage fix.

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

Fix build breakage when exception hooks aren't enabled,
introduced by r1587695 (and my silent killer proposal)

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

Vote and promote r1585090.

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

Vote and promote r1514255.

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

Merge r1531672 from trunk:

mod_auth_form: Make sure the optional functions are loaded even when
the AuthFormProvider isn't specified.

Submitted by: minfrin
Reviewed/backported by: jim

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

Merge r1585918 from trunk:

Only read "active" values from the key_files array. PR 56306.

Submitted by: kbrand
Reviewed/backported by: jim

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

Merge r1585919 from trunk:

Reverse the order when merging global and vhost-level config arrays.
Putting the vhost-level elements last allows overriding global settings
(for the deprecated SSLRequire directive, the order is irrelevant,
all of them must be met, cf. ssl_engine_kernel.c:ssl_hook_Access).

Submitted by: kbrand
Reviewed/backported by: jim

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

Merge r1546801 from trunk:

If the "value" argument is prefixed with expr=, parse it with ap_expr
rather than mod_headers' built-in format strings.

Submitted by: covener
Reviewed/backported by: jim

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

Vote and promotion.

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

rebuild docs

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

merge r1588213 from trunk:
  Add hint about RequestHeader

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

Vote, promote.

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

Merged.

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

Merge r1587255 from trunk:

* support/rotatelogs.c (main): Prevent creation of zombies from
  post-rotate programs.

Reviewed by: druggeri, ylavic, covener

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

s/two/three/

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

merge r1588065 from trunk
add change to makefile.win missing from r1588054
which was merged to 2.4 in r1588064

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

Merged /httpd/httpd/trunk:r1515403,1515411,1515420,1517175,1521909,1526647,1541181,1578762,1585054,1585072,1588054

mod_authnz_fcgi: New module to enable FastCGI authorizer
applications to authenticate and/or authorize clients.

Submitted by: trawick, jailletc36, gsmith
Approved by: trawick, jim, gsmith

(Thanks gsmith for the Windows build bits!)

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

votes and promote

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

Revert r1587881, I have committed it to 2.4.x by a mistake. sorry.

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

core.xml: document Warning directive

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

vote/promote

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

withdraw -0 and promote

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

propose a small mod_headers feature from trunk

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

Remove -1 on UDS proposal.

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

Merge r1564437 from trunk:

* Do not parse URL in case of regular expression as they likely do not follow
  the URL syntax.

PR: 56074

Submitted by: rpluem
Reviewed/backported by: jim

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

Merge r1580568 from trunk:

mod_reqtimeout: Resolve unexpected timeouts on keepalive requests
under the Event MPM. PR56216.

Submitted By: Frank Meier <frank meier ergon ch>
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1546759, r1546760 from trunk:

Add suspend_connection and resume_connection hooks to notify modules
when the thread/connection relationship changes.  (Currently implemented
only for the Event MPM; should be implemented for all async MPMs.)

follow-up to r1546759: remove an inadvertently committed testcase
Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1585824 from trunk:

mod_proxy_fcgi: Fix sending of response without some HTTP headers
that might be set by filters.

The problem occurs when no body bytes were read while reading the
response headers, resulting in an empty brigade being sent down
the filter stack.  One particualr filter that mishandles the empty
initial brigade is mod_deflate.  It neglects to add to the response
header fields.

PR: 55558
Submitted by: Jim Riggs <jim riggs.me>
Reviewed by: trawick

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1584878 from trunk:

Do not delete the wrong data from HTML code when a "http-equiv" meta tag specifies a Content-Type behind any other "http-equiv" meta tag.
PR 56287 [Micha Lenk <micha lenk info>]
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1584884 from trunk:

Do not scan past the end of the buffer.
If no terminating delimiter is found, just leave things as it is
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1584896 from trunk:

Do not perform a p+= 7 that could go past the end of the buffer in case we find a 'content' without a corresponding '='.

Should we need to deal with this case, a new search should be performed to find the real starting position of another potential 'content=' pattern.
Submitted by: jailletc36
Reviewed/backported by: jim

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

A question...

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

propose some recent wstunnel fixes together in a small bundle

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