Follow-on to 8e954cf5f0be61eb9ac6fa6e8f04ee6dcf4aaf23 - use HTTP_HOST if there's no SERVER_NAME