generated changes

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

Remove redundant paragraph and fix grammar errors.

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

generated changes

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

Fix spelling and grammar errors.

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

Generated doc files.

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

Fix r1593664 where I miss read the code and what is performed in "header_inout_cmd()" where arguments are "shuffled" according to the "action" to be performed.

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

New mod_proxy proposals.

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

Add some missing changes.

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

Hmmm... wasn't added w/ the patch :/

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

Merge r1546730, r1583008, r1571369, r1552130, r1578760, r1592615, r1592632, r1595321, r1550302, r1550307, r1585435 from trunk:

fix whitespace in a debug message

s/comment/self-documenting/

normalize an ugly construct which somehow manages to return the correct value

This is annoying to see in a casual "LogLevel debug foo:traceX ..."

Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.

Follow-up to r1592529:

Define default port for "scgi" schemes (as chosen by
mod_proxy_scgi) in a common location.

Suggested by: jailletc36

fix Doxygen markup error

Submitted by: jailletc36

Tweak a AP_DEBUG_ASSERT condition.
Valid index to use 'req_header_var_names' are 0...6

mod_auth_form: Add a debug message when the fields on a form are not
recognised.

mod_auth_form: Make the trace logging consistent through the notes, session
and form authentication steps.

mod_auth_form: update empty log tags.
Submitted by: trawick, covener, jailletc36, trawick, trawick, jailletc36, minfrin, minfrin, ylavic
Reviewed/backported by: jim

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

Propose r1599486.

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

Promote.

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

Fix layout in previous commit

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

AcceptFilter has two parameters + syntax highlight
See r1397602 on trunk

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

Rebuild.

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

XML Updates.

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

Merge r1592511, r1592514 from trunk:

reformat only (get rid of unnecessary block scope)

Clarify an existing requirement of the server_portstr parameter
to ap_proxy_determine_connection(): it must be a buffer of at
least one byte in size.

(And don't bother with using strcpy in order to zap a string.)

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1591328, r1594643, r1594648 from trunk:

mod_cache: Preserve non-cacheable headers forwarded from an origin 304
           response. PR 55547.

When mod_cache asks for a revalidation of a stale entry and the origin responds
with a 304 (not that stale), the module strips the non-cacheable headers from
the origin response and merges the stale headers to update the cache.

The problem is that mod_cache won't forward the non-cacheable headers to the
client, for example if the 304 response contains both Set-Cookie and
'Cache-Control: no-cache="Set-Cookie"' headers, or CacheIgnoreHeaders is used.

mod_cache: follow up to r1591328.

Define the cache_merge_headers_out() function to merge r->err_headers_out into
r->headers_out and add the ones from r->content_type/encoding if available.
Use it in ap_cache_cacheable_headers_out() where the same is done and in
cache_save_filter() where this has to be done before updating the entry.

mod_cache: follow up to r1594643.

Avoid table lookup if not necessary (fast path first).

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1594625 from trunk:

mod_proxy_wstunnel: Fix the use of SSL connections with the "wss:" scheme.
                    PR55320.

Submitted by: Alex Liu <alex.leo.ca gmail.com>
Committed by: ylavic

Submitted by: ylavic
Reviewed/backported by: jim

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

xforms

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

promote (more this weekend)

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

votes

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

update Japanese translation
(simply copy from trunk except revision ref)

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

Rebuild.

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

XML Update.

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

Rebuild.

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

XML updates.

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

Merge r1560683 and r1581011 from trunk:

(mod/mod_proxy_express.xml)
It does more than just a ProxyPass, but also looks at the HOST header,
so this gives somewhat deeper insight into what the end result looks
like.

(mod/mod_proxy_connect.xml)
a comma leaked onto the page

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

Vote for mod_deflate patch.

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

Fix typo spotted on online doc by Louise Hope.
#comment_2558

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

xforms

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

comment #2562 -- copy/paste error in CacheSocache.  Already correct on trunk.

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

Merge r1598088 from trunk:

fix typo -- comment 2561

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

thie file is not outdated.

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

HTML build.

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

XML Updates.

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

update transformations

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

update Japanese translation update Japanese translations
(simply copy from trunk except revision ref)

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

Merge r1517551, r1517588 and r1517589 from trunk

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

update Japanese translations

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

update Japanese translations
(simply copy from trunk except revision ref)

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

Merge r1516872, 1542353 and 1580895 from trunk:
  howto/index.xml:
    CGI is no longer the most common way to provide dynamic content, is it?
  howto/access.xml:
    Suggest the 'require expr' syntax as an alternate way to do something.
  caching.xml:
    elaborate on the early/late vs "Authorization" header (vs. other forms of
    authorization)

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

HTML rebuild.

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

fenêtre du cadre création
--fenêtre du cadre créationCette ligne, et les suivantes ci-dessous, seront ignorées--

M    manual/glossary.xml.fr

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

HTML rebuild.

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

XML Updates.

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

Meger r1597021 from trunk:
follow up r1387612(and 1387618):
All current windows have functionality of windows service,
so remove the redundant phrase.

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

Fix typo spotted on online doc by Gerard H. Pille.

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

rebuild

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

Remove proposal. This doc change has been applied.

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

Add version number in <title>

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

Update.

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

Proposal

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

Fix typo spotted on online doc by Markie.

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

Merge r1595426 from trunk:

mod_socache_shmcb: Correct counting of expirations for status display.
Expirations happening during retrieval were not counted.

Submitted by: rjung
Reviewed/backported by: jim

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

Merge r1591143 from trunk:

mod_cache: Retry unconditional request with the full URL (including the
           query-string) when the origin server's 304 response does not
           match the conditions used to revalidate the stale entry.

http://www.mail-archive.com/dev@httpd.apache.org/msg59884.html

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1591320, r1591322, r1591390, r1591394 from trunk:

mod_cache: Don't add cached/revalidated entity headers to a 304 response.
           PR 55547.

When the conditional request meets the conditions of the stale then revalidated
entry, the forwarded 304 response includes the entity headers merged from the
cached headers (before updating the entry).
Strip them before returning a 304.

Since the entity headers are stripped elsewhere, factorize the code using a
new table (MOD_CACHE_ENTITY_HEADERS[]) containing these headers's names.

mod_cache: follow up to r1591320.

Use the new MOD_CACHE_ENTITY_HEADERS[] names to check 304 contradictions
against the same headers.

mod_cache: follow up to r1591322

Avoid one unnecessary test when checking 304 contradictions.

mod_cache: follow up to r1591390

Fix code typo.

Submitted by: ylavic
Reviewed/backported by: jim

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

Propose: Allow reverse-proxy to be set via explicit handler.

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

add missing svn:keyword

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

HTML build.

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

XML updates.

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

Fix typo as spotted in a comment in online doc by JPKole

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

Fix typo in comments.

trunk commits:
r1491180
r1563894, r1566428, r1566449

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

Votes, promotions.

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

Update.

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

Update.

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

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