merged to 2.4.x


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1515368 13f79535-47bb-0310-9956-ffa450edef68
merged to 2.4.x


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1515371 13f79535-47bb-0310-9956-ffa450edef68