Merged r1375,r1383 and r1391 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/serf/branches/0.6.x@1698929 13f79535-47bb-0310-9956-ffa450edef68
4 files changed