Propose backport of fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=54456

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1444372 13f79535-47bb-0310-9956-ffa450edef68