iobuffersize for mod_proxy_fcgi?

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

vote, propose

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

set 2.4.9 release date to the date Jim sent the announcement e-mail

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

Propose.

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

Vote, promote.

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

Vote.

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

Propose.

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

Add missing variables:
Introduced in r1132494
   CONTEXT_PREFIX
   CONTEXT_DOCUMENT_ROOT
and since the beginning of util_expr_eval.c  for
   HTTP_COOKIE

Description still missing.

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

Provide a single 2.4.x patch where multiple trunk commits are involved.

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

Add 2.4.x patch to mod_cache proposal.

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

Add r1594648 to mod_cache proposal.

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

(Re)propose (improved) fix for PR 55547.

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

Propose r1594625.

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

Updates.

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

Merge r1583175 and r1593745 from trunk:

mod_alias: Stop setting CONTEXT_PREFIX and CONTEXT_DOCUMENT environment
variables as a result of AliasMatch.

Submitted by: covener
Reviewed by: jim, ylavic

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

Merge r1583007 from trunk:

mod_authn_socache: fix logging of bogus rv in r1576233

Submitted by: trawick
Reviewed by: jim, ylavic

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

Merge r1591472 from trunk:

mod_proxy_fcgi: remove wasted memset() calls and other historical bits

Submitted by: trawick
Reviewed by: jim, ylavic

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

Votes + 2.4.x patch for mod_deflate reentrance bundle.

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

ivote

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

Fix some comment typos

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

Based on report from Ken Zalewski, on online doc.

Add missing Server-Variables useable in RewriteCond directive.
Introduced in r1132494
   CONTEXT_PREFIX
   CONTEXT_DOCUMENT_ROOT
Introduced in r737973
   IPV6
Missing for ages!
   SCRIPT_GROUP
   SCRIPT_USER

I have added where I found it logical, feel free to adjust.
I have also reordered this table to ease reading.
Finally, I have beautified some tables at the end.

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

propose aliasmatch removal

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

Fix typo in previous commit

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

Minor visual improvement.
Remove useless link.

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

- Add missing links
- Fix extra ] spotted in online doc by emigas.
- Remove another ] introduced in Hearder syntax in r1588244
- s/variable/varname/ to match the text below it.
- Turn the syntax of both Header and RequestHeader to be:
   header [value [replacement [early|env=[!]variable|expr=expression]]]
in order to match the code.
This removes the ambiguity of expr=<something> which can now be used in 2 different places in the syntax.
- Also remove the space in 'expr= value' in compatibility note, to help distinguish between the two

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

vote

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

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