You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by lg...@apache.org on 2012/10/02 15:21:13 UTC

svn commit: r1392906 - in /subversion/branches/1.7.x-r1388975: ./ subversion/libsvn_ra_serf/util.c

Author: lgo
Date: Tue Oct  2 13:21:12 2012
New Revision: 1392906

URL: http://svn.apache.org/viewvc?rev=1392906&view=rev
Log:
On the '1.7.x-r1388975' branch: merge r1388975 from trunk.

Modified:
    subversion/branches/1.7.x-r1388975/   (props changed)
    subversion/branches/1.7.x-r1388975/subversion/libsvn_ra_serf/util.c

Propchange: subversion/branches/1.7.x-r1388975/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1388975

Modified: subversion/branches/1.7.x-r1388975/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1388975/subversion/libsvn_ra_serf/util.c?rev=1392906&r1=1392905&r2=1392906&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1388975/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/branches/1.7.x-r1388975/subversion/libsvn_ra_serf/util.c Tue Oct  2 13:21:12 2012
@@ -1901,7 +1901,8 @@ handle_response(serf_request_t *request,
 
       if (err
           && (!SERF_BUCKET_READ_ERROR(err->apr_err)
-               || APR_STATUS_IS_ECONNRESET(err->apr_err)))
+               || APR_STATUS_IS_ECONNRESET(err->apr_err)
+               || APR_STATUS_IS_ECONNABORTED(err->apr_err)))
         {
           /* These errors are special cased in serf
              ### We hope no handler returns these by accident. */