Update Christopher Schultz' proposal with an actual patch. I am keeping Christopher's vote. The difference between this patch and his fix in TC6 is trivial.
tomcat/tc5.5.x/trunk/STATUS.txt