fixes client socket timeout issue #1435
Merge pull request #1609 from gurbuzali/client-socket-timeout-issue-1435/3.x

fixes client socket timeout issue #1435