Improve support for IPv4 vs IPv6 virtual hosts (fixes SF bugs #1087699, #1087668).