* Resolve conflicts that came up after we backported another proxy fix. The

  "new" patch is only a rediff without these conflicts.


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