Unclear why half of r1743512 was previously merged, but here's the remainder.

PR62190 



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