Port r673820 to 4.1.x Extract the query string before we try to normalise the URI This is CVE-2008-2370
Changed paths: