On the serf_error_callbacks_branch: Sync with trunk r1931266.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/serf_error_callbacks@1931267 13f79535-47bb-0310-9956-ffa450edef68