Fixes #70 - Default options are overriding command line defined options

[ogirardot]

Test is included to check that the timeout default for the socket now is clearly defined.
Any comment is welcomed.

Regards,

Olivier.

[carljm]

Hi @ssaboum - thanks for these fixes.

Note that a pull request on github includes all commits on the source branch, including commits you push after you create the pull request. Since you are making all your fixes directly on your develop branch, this pull request now has accumulated fixes for three unrelated issues, which makes review more difficult.

Pull requests are designed for a workflow where you make your fixes on individual bugfix/feature branches in your repo rather than the main development branch; then the pull request will only ever include the one thing (or any updates you make to that specific bugfix/feature branch, which should all be related to the same issue).

[carljm]

The other risk with making changes directly in your develop branch is that your changes may not be merged as-is. In this case, the fix for #70 is wrong (I'll explain in a comment on that issue), but the fixes for #182 and #310 are fine. Since you committed them all on the same branch, and the wrong fix first, I have to cherry-pick instead of merge, meaning you'll now have to force-reset your develop branch.

Thanks for the fixes!

[ogirardot]

oops :)
yeah sorry i got carried away.