Port fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=29936 and https://issues.apache.org/bugzilla/show_bug.cgi?id=45933 This addresses CVE-2009-0783
Changed paths: