New fixes yesterday; slightly revised patch to match.

  The -3.patch now covers every one of my test cases flawlessly,
  please ruthlessly test/abuse/review this final(?) patch.


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