Merge r1635644 from trunk:

mod_proxy_wstunnel: abort backend connection on polling error to avoid
further processing (lingering close, SSL shutdown).

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1640040, r1640042 from trunk:

mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error
when parsing or forwarding the response fails.

Follow up to r1640040: CHANGES entry.
Submitted by: ylavic
Reviewed/backported by: jim

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

promote

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

vote

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

Merge r1635428 from trunk:

core: Do not match files when using DirectoryMatch. PR41867.

Submitted by: jkaluza
Reviewed/backported by: jim

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

Merge r1638073 from trunk:

* server/scoreboard.c: Check for child_num < 0 also in ap_update_child_status
and ap_update_child_status_from_conn. PR 56767.

Submitted by: jkaluza
Reviewed/backported by: jim

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

Merge r1638072 from trunk:

mod_auth_basic: Fix comment mentioning 403 instead of 401.

Submitted by: jkaluza
Reviewed/backported by: jim

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

Votes, promotions, and comment.

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

xforms

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

Merge r1642590 from trunk:

use an actual list since we're gong to the trouble to use -in

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

xforms

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

Merge r1642581, r1642584 from trunk:

even out some whitespace

add a few more examples per feedback

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

propose mild mod_lua CVE

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

propose rewrite usability feature

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

Rebuild.

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

XML update.

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

Rebuild.

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

Typo.

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

Rebuild.

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

XML update.

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

Merge r1638772 from trunk

   * mod_ssl: call ERR_free_strings() with OpenSSL >= 0.9.8e. Fixes memory
     leak in mod_ssl on graceful restart. PR 53435.

Submitted by: jkaluza
Reviewed by: jkaluza, ylavic, covener
Backported by: jailletc36

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

Merge r1533765, r1621419, r1638159, r1638188, r1601603, r1638412, r1418763 from trunk

    ssl: Axe needless string duplication in setup for call to apr_proc_create()
    Fix sscanf format spotted by cppcheck
    fix indent.
    fix style
    Private function doesn't need ap_ prefix.
    tab vs space
    rename variables: s should be the server_rec

Submitted by: trawick, jailletc36, jailletc36, jailletc36, takashi, jailletc36, sf
Reviewed by: jailletc36, ylavic, covener
Backported by: jailletc36

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

Refer to versions in the release branch

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

Propose r1609680 and r1641381.

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

xforms

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

Merge r1641888 from trunk:

add a few more expresion examples to illustrate functions and -f

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

promote

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

votes

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

rejigger vote on event backport by adding ylavic's followup.

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

Propose r1640495.

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

Merged.

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

Merge r1640036, r1640331 from trunk:

mod_proxy_fcgi: SECURITY: CVE-2014-3583 (cve.mitre.org)
Fix a potential crash with response headers' size above 8K.

The code changes to mod_authnz_fcgi keep the handle_headers()
function in sync between the two modules.  mod_authnz_fcgi
does not have this issue because it allocated a separate byte
for terminating '\0'.

Submitted by: ylavic, trawick
Reviewed by: ylavic, trawick, mrumph

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

xforms

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

Merge r1641434 from trunk:

move text outside of example for readability.

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

xforms

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

Merge r1641414 from trunk:

steal the sethandler example from mod_proxy.html and mention worker issue

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

xforms

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

Merge r1641384 from trunk:

the next sentence says:

The URL argument must be parsable as a URL before regexp substitutions (as well as after). This limits the matches you can use. For instance, if we had used

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

Merge r1641311, r1641382 from trunk:

surprising but confirmed by comment in mod_proxy

test/document php-fpm with proxy_fcgi

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

quick votes

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

Vote for mod_proxy_fcgi fix and add references for APR and APR-util 1.5.x branches.

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

Propose r1635428.

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

Propose r1638072 and r1638073.

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

*fcgi fun

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

Rebuild.

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

XML updates.

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

Propose new *fcgi fix.

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

Propose CVE-2014-3583 fix made minimal.

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

Propose follow-up r1640031.

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

Vote

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

Votes.

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

Update fcgi fixes proposals according to Jeff's review.

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

Propose poll()ing fixes for proxy_connect (PR57168) and proxy_wstunnel.

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

propose the right event fix

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

yank event proposal, it is about to be superceded in trunk

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

Easy proposals to synch 2.4 and trunk

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

propose event fix

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

Propose fix for CVE-2014-3583.

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

Propose r1638772.

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

Vote.

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

propose event fix http://svn.apache.org/r1638691 which was regressed in 2.4.10 and 2.4.11

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

Merge r1635762 from trunk:

Support custom ErrorDocuments for HTTP 501 and 414 status codes.
PR 57167 [Edward Lu <Chaosed0 gmail.com>]

Submitted By: Edward Lu <Chaosed0 gmail.com>
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@1638071 13f79535-47bb-0310-9956-ffa450edef68

Merge r1632740 from trunk:

mod_cache: avoid unlikely access to freed memory.
Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1622450 from trunk:

ab: increase request and response header size to 8192 bytes,
fix potential buffer-overflow in Server: header handling.

Submitted by: jkaluza
Reviewed/backported by: jim

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

xforms

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

Merge r1637768 from trunk:

fix copy/paste error for CacheSocacheMinTime, rest of content is correct.
  http://httpd.apache.org/docs/trunk/mod/mod_cache_socache.html#comment_3247

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

Rebuild.

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

XML updates.

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

vote, promote

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

missed mergeinfo update from r1637114

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

make docs

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

merge r1637112 from trunk:

mention the cmake-based build

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

Vote.

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

Vote, comment.

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

Merge r1636195 from trunk:

namded captures show up in the env with a MATCH_ prefix.
   http://httpd.apache.org/docs/2.4/sections.html#comment_3193

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

Merge r1636189 from trunk:

add a -in wordlist example, change 'string list' to wordlist so you can jump to the grammar.
leave a hint about line endings (uncommitted change in my tree)

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

restore SECURITY to top

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

committed

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

Merge r1634425 from trunk:

When using EBCDIC encoding, HTTPS through ProxyPass and ProxyRemote doesn't
work correctly. PR 57092

Submitted By: Edward Lu
Reviewed By: covener, jim, ylavic

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

Merge r1634237 from trunk:

fix another case of 304 response sent to an unconditional request

Submitted By: covener
Reviewed By:  covener, jim, ylavic

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

Merge r1633031, r1633522, r1633529, r1633530 from trunk

Style fix

Submitted by: jailletc36
Reviewed by: jailletc36, jim, ylavic
Backported by: jailletc36

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

Merge r1611858, r1611908, r1611916 from trunk

doc: improve doxygen output for util_ebcdic.h and util_charset.h.

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

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

Vote

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

propose errordoc fix

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

Propose r1622450 and r1626978.

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

make docs

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

merge r1635558 from trunk:

show a bit more of openssl's -status display

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

make docs

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

merge r1635510 from trunk:

more hints for OCSP Stapling:

* when a different cache mechanism is used...
* testing that your server sends an OCSP response

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

fix typo in "mod_ssl"

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

Merge r1631983 from trunk:

mod_substitute: no real functional change, but:
  - define default for maximum line length
    indepenent of MAX_STRING_LEN
  - Clarify line length check with a comment
  - add supported 'b' suffix to directive
    description

Submitted by: rjung
Reviewed by: jim, ylavic

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

Split suggested by Christophe done.

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

Work on split suggested by Christophe.

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

Vote and promote.

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

Note

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

Fix compatibility note + rebuild

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

Merge r1634736 from trunk:

Remove commented-out SSLStaplingForceURL at global scope.

Global or not, its use is specialized and those that need it won't need a sample,
and others may be confused.

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

Merge r1629372, r1629485, r1629519 from trunk:

Move OCSP stapling information from a per-certificate store
(ex_data attached to an X509 *) to a per-server hash which is
allocated from the pconf pool. Fixes PR 54357, PR 56919 and
a leak with the certinfo_free cleanup function (missing
OCSP_CERTID_free).

* modules/ssl/ssl_util_stapling.c: drop certinfo_free, and add
  ssl_stapling_certid_free (used with apr_pool_cleanup_register).
  Switch to a stapling_certinfo hash which is keyed by the SHA-1
  digest of the certificate's DER encoding, rework ssl_stapling_init_cert
  to only store info once per certificate (allocated from the pconf
  to the extent possible) and extend the logging.

* modules/ssl/ssl_private.h: adjust prototype for
  ssl_stapling_init_cert, replace ssl_stapling_ex_init with
  ssl_stapling_certinfo_hash_init

* modules/ssl/ssl_engine_init.c: adjust ssl_stapling_* calls

Based on initial work by Alex Bligh <alex alex.org.uk>

Follow up to r1629372: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_value).

Follow up to r1629372 and r1629485: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_[num|value|pop] macros).
Submitted by: kbrand, ylavic, ylavic
Reviewed/backported by: jim

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

Merge r1629508 from trunk:

mod_cache_socache: Change average object size
hint from 32 bytes to 2048 bytes.

Submitted by: rjung
Reviewed/backported by: jim

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

Merge r1629507, r1629652 from trunk:

mod_cache_socache: Add cache status to server-status.

The status_hook simply calls the status function of
socache, very much like mod_ssl does for the ssl
session cache.

Silence build warning about missing prototype.
Followup to r1629507.

Submitted by: rjung
Reviewed/backported by: jim

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