The 2 first patches from PR45355 have been ported

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