subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r1393045 - in /subversion/branches/1.7.x: ./ subversion/libsvn_ra_serf/util.c
Date Tue, 02 Oct 2012 17:19:47 GMT
Author: cmpilato
Date: Tue Oct  2 17:19:46 2012
New Revision: 1393045

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

 * r1388975
   Fix for issue #4174: serf checkout/export aborts early on Windows.
   Justification:
     Fixes issue that currently makes svn+serf+SSL on Windows unusable.
   Notes:
     For the issue to stop occuring, serf 1.1.1 is required. This version is
     not yet released, testing can be done with HEAD of serf branch 1.1.x.
   Branch:
     ^/subversion/branches/1.7.x-r1388975
   Votes:
     +1: lgo, rhuijben, cmpilato

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

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

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c?rev=1393045&r1=1393044&r2=1393045&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c Tue Oct  2 17:19:46 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. */



Mime
View raw message