[master] + fix javadoc
+ use forgotten clientSocketSoTimeout option (thanks to Matt)