Fix connection reuse + port pre-flight (#6715)