Store socket FD after connect
Merge pull request #833 from mrvn/pull_store-fd-on-connect

Store socket FD after connect