Adding support for client timeout
Refactoring client timeout
Merge pull request #388 from wpreul/feature/clienttimeout

Adding support for client timeout