Merged r1444 and r1445 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/serf/branches/0.7.x@1698983 13f79535-47bb-0310-9956-ffa450edef68
1 file changed