Merge r1476680 from trunk:

mod_proxy: Clarify the usage suggestion for BalancerInherit and ProxyPassInherit.

Submitted by: minfrin
Reviewed/backported by: jim


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

htpasswd: Add -v option to verify a password

htpasswd and htdbm could use some more refactoring...

Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477651 13f79535-47bb-0310-9956-ffa450edef68
Merge r1305167, r1330964, r1388660, r1388899, r1391396, r1391398, r1392214, r1406760, r1418648 from trunk:

Update transformations.


syntax for mod_b*.xml and mod_c*.xml

mod_cache_socache: New cache implementation backed by mod_socache
that replaces mod_mem_cache removed from httpd v2.2.


Windows build for mod_cache_socache added in r1388660


Fix the return values on mod_cache_socache's store_headers() implementation
to return APR errors codes and not DECLINED. We are committed to using this
implementation by this point, and any error should force us to stand down.
Submitted by: trawick
Reviewed by: minfrin


Apply proper APLOGNO codes for mod_cache_socache.


Added mod_cache_socache to NetWare build.


* Ensure that nkey is initialized.

mod_cache_socache: Don't clean up too soon. If we do, revalidated requests
lose their bodies.

Submitted by: minfrin, humbedooh, minfrin, gsmith, minfrin, minfrin, fuankg, rpluem, minfrin
Reviewed/backported by: jim


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