improvement in socket connection timeout handling to allow clean retry to be performed