Merge r1230069 from trunk:

Submitted by: jorton
Reviewed/backported by: jim

SECURITY (CVE-2012-0031) patch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1231058 13f79535-47bb-0310-9956-ffa450edef68