Merge r1674632 from trunk:

mod_proxy_wstunnel: Bypass the handler while the connection is not
upgraded to WebSocket, so that other modules can possibly take over
the leading HTTP requests.

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1671397, r1672466, r1672564 from trunk:

Add output for "?auto" version of server-status
to proxy status, mod_ssl session cache info,
mod_cache_socache and the status hook of the
individual socache implementations.

Followon to r1671397 for proxy server-status
in auto mode:
- don't show HTML legend
- Show correct worker name

More followon to r1671397 for proxy server-status
in auto mode:
- remove remaining HTML markup

Submitted by: rjung
Reviewed/backported by: jim

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

Merge r1671396, r1672289, r1672453 from trunk:

Add more data to "?auto" view of server-status.

Although mod_status source code calls this the
"short_report", the docs and the API flag call
it "Machine Readable" resp. "STAT_OPT_AUTO".
So IMHO the data shown should be on par with
the html version.

Followon to r1671396:
Remove unwanted redundant output introduced
by that commit.

Followon to r1671396: add misiing newline in
new server-status output.

Submitted by: rjung
Reviewed/backported by: jim

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

Merge r1646282 from trunk:

* Fix If-Match handling:
  - We need to fail if we do NOT match.
  - ETag comparison only makes sense if we have an ETag

PR: 57358
Submitted by: Kunihiko Sakamoto <ksakamoto google.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed/backported by: jim

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

promote

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

vote

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

Merge r1520445, r1672985, r1672989, r1673769 from trunk:

Add a warning if protocol given in SSLProtocol  or SSLProxyProtocol will override other parameters given in the same directive.
This could be a missing + or - prefix.

PR 52820

Tweak log message

Add CHANGES entry before backport proposal

Follow-up to r1520445:

Tweak error message for clarity

Submitted by: jailletc36, trawick
Reviewed/backported by: jim

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

Merge r1674606 from trunk:

Fix duplicated APLOGNOs from r1661067 and r1661448.
Submitted by: ylavic
Reviewed/backported by: jim

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

Rebuild.

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

XML updates.

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

APLOGNO goodness

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

quick votes

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

New proposals.

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

vote/promote

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

Fix doc as spotted by Falco Schwarz in online doc

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

Rebuild.

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

XML updates.

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

rebuild docs with meta element enabled

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

backport http://svn.apache.org/r1674382

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

update transformation

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

Propose

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

Don't match just .cgi or ..cgi or ...cgi, etc.

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

Rebuild

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

Applies fix recommended in bz56346

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

Rebuild a crapload of xdocs

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

Update proposal (client_failed) for mod_proxy_ajp.

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

minor capitalization tweaks

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

Add r1673769 to a proposal (tweak error message)

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

Correct a regex so that it doesn't match the file named '.cgi'

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

Resolves bz55123 - spaces around emdashes

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

clarify, fix typo

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

inadvertent change in 1673940

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

Merge r1634120 from trunk:

* Use the correct server name for SNI in case the backend SSL connection itself
  is established via a proxy server.

PR: 57139
Submitted by: Szabolcs Gyurko <szabolcs gyurko.org>

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

Merge r1666297 from trunk:

ssl_util: Fix possible crash (free => OPENSSL_free) and error path leaks when
checking the server certificate constraints (SSL_X509_getBC()).

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

compat info pointed out by Christophe

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

Merge r1652955, r1652985, r1652989 from trunk:

    PR 57379: If mod_cgi and mod_cgid get installed,
    use IfModule for MPM to LoadModule mod_cgi for
    prefork and mod_cgid for all other MPMs.

    Previously when combined with --enable-load-all-modules
    both modules were loaded and it was undefined
    which one actually handled cgi requests.

    Based on a patch by olli hauer <ohauer gmx.de>.

    Addition to r1652955: Use "=" in combination
    with "test" instead of "==".

    Fix indentation and tab use after r1652955.

Submitted By: olli hauer <ohauer gmx.de>
Reviewed By: rjung, ylavic, covener

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

Merge r1671918, r1673113 from trunk:

allow time to first byte (of response headers)
to be logged by mod_logio.

mod_logio was just a conveninent place to do this
w/o writing a new filter or complicating an existing
important one.

Use 'unsigned int' in bitfield

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

Backport r1669299 from trunk:

  *) mod_proxy_wstunnel: Avoid an empty response by failing with 502 (Bad
     Gateway) when no response is ever received from the backend.

Submitted By: jkaluza
Reviewde By: covener, ylavic, trawick

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

Merge r1673455 from trunk:

mod_ssl: Protect ENGINE_CTRL_CHIL_SET_FORKCHECK macro with a
featue check for libressl.

Submitted by: Stuart Henderson <sthen openbsd.org>
Reviewed by: covener, trawick, ylavic

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

mod_proxy_http: Use the "Connection: close" header for requests to
backends not recycling connections (disablereuse), including the default
reverse and forward proxies.

Submitted by: ylavic (and trawick for an old helper function)
Reviewed by: rjung, covener

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

Note which indexoptions require fancyindexing. resolves bz56985

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

Moving back event timers duplicates fix to proposals.

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

ask for details on stalled issue

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

We need moar emails - format change

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

Merge r1632742, r1634836 from trunk:

mod_buffer: Forward flushed input data immediately and avoid (unlikely)
access to freed memory.

Submitted by: ylavic, jailletc36
Reviewed by: covener, rjung

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

Flip directives and topics sections after discussion around ordering

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

doubl-rainbow vote/promote

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

Merge r1642847 and r1673155 from trunk so that yesterday's ApacheCon talk is valid:

core: Add CGIPassAuth directive to control whether HTTP authorization
headers are passed to scripts as CGI variables.

PR: 56855
Reviewed by: rjung, ylavic

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

Rebuilds Daniel's change to the order of directictives vs topics in
manual docs

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

Adjust template to align page content with table of contents

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

one pear-flavored drink, one vote

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

sorry for crappy comment

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

Rebuild

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

conditional +1 for errorlogprovider

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

Resolves bz56695 - %O can in fact be zero sometimes.

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

Jeff's ajp confusion

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

Applies patch from bz57189, thanks go to Tom Fredrik Blenning. Adds
Norwegin translations of error pages

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

Rebuild core.html and translations

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

As per bz53530, a brief explanation of when you may and must use quotes
in directory paths.

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

had to move on

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

Next conditional vote :p

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

Vote/Promote.

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

quid

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

merge

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

Conditional vote :p

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

Vote/Promote.

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

pre-caffeine lowest-hanging-fruit

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

smattering of backports

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

approved, not a showstopper!

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

vote/promote

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

Build..

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

Related to  httpd-doc bug 53530; uniform use of quotation marks.
Put quotation marks around most arbitrary-text or filesystem
strings for directives:
 * {Alias,Redirect,Proxy*}{,Match}
 * <{Directory,Files,Location}{,Match}>

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

Rebuild HTML docs

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

Clarify order of operations - some variables aren't accessible to If.
See bz 53349 for context.

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

Rebuild HTML docs

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

Clarifies (I hope) what RewriteRule patterns are matched against. See
bz53153 for context.

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

Rebuild

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

Clarifies FilesMatch and LocationMatch examples, as per bz53483

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

Rebuild HTML docs

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

Clarify DirectoryMatch example. (bz 53483)

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

Rebuild

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

Add "pre-compressed content" reccipe, as per
https://bz.apache.org/bugzilla/show_bug.cgi?id=51336

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

one patch is enough

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

Remove an empty line at the end of the file to synch with trunk.

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

Of course I trusted you in advance...

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

updated CGIPassAuth per current comments

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

Merge r1661486 from trunk:

core.c: Fix warnings about unused variables

Reviewed by: rjung, jailletc36

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

Vote + promote

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

Propose

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

Some votes.

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

Propose.

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

Rebuild.

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

Update.

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

Rebuild.

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

XML Updates.

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

make docs

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

Merge r1672757 from trunk:

mod_proxy_wstunnel isn't limited to Unix

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

CGIPassAuth just tested with 2.4.x's mod_proxy_scgi

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

warnings are distracting :)

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

make docs

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