- Removing so query timeout is not overwritten by connection timeout
- Fixing so the default value of timeout is None which means no timeout, instead of 0 that means non blocking socket.