connection with an optional timeout, and modified httplib.py to
use this function in HTTPConnection. Applies patch 1676823.