backported


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