(Re)propose (improved) fix for PR 55547.

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