Follow up to r1820810.

Join the previous proposal with another one (leak fix), not really
related but code conflicts...



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