Merge r1451849 from trunk:

The 2 first patches from PR45355 have been ported
Submitted by: jailletc36
Reviewed/backported by: jim


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