UseCanonicalName semi-broken in 1.3.x

[Jim Jagielski]

It's been brought to my attention that UseCanonicalName in
1.3 is semi-broken, not completely honoring the port value
when UseCanonicalName Off (see ap_get_server_port()).
Heartburn if I fix this?