Merge r102320 from trunk:

  If the proxy was enabled, and UseCanonicalHostname was off, then the Via:
  header would report not the proxy hosts's ServerName (or any of its
  configured VHosts's names) as it should, but the *origin hosts*'s name.  Now
  it reports its ServerName.

Author: martin


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