[2.3.x]
+ fix javadoc
+ use forgotten clientSocketSoTimeout option (thanks to Matt)
[2.3.x]
+ fix copyrights
+ minor updates