subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r982550 - /subversion/trunk/subversion/libsvn_ra_serf/util.c
Date Thu, 05 Aug 2010 11:45:07 GMT
Author: rhuijben
Date: Thu Aug  5 11:45:06 2010
New Revision: 982550

URL: http://svn.apache.org/viewvc?rev=982550&view=rev
Log:
* subversion/libsvn_ra_serf/util.c
  (handle_response): ECONNRESET is handled by serf, so don't put it in the
    pending errors list as that will abort the entire session.
  (handle_response_cb): Wrap the queueing of the pending error to improve
    debug information. Remove unneeded if.

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/util.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=982550&r1=982549&r2=982550&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Thu Aug  5 11:45:06 2010
@@ -1515,7 +1515,9 @@ handle_response(serf_request_t *request,
 
       err = ctx->response_handler(request,response, ctx->response_baton, pool);
 
-      if (err && !SERF_BUCKET_READ_ERROR(err->apr_err))
+      if (err
+          && (!SERF_BUCKET_READ_ERROR(err->apr_err)
+               || APR_STATUS_IS_ECONNRESET(err->apr_err)))
         {
           /* These errors are special cased in serf
              ### We hope no handler returns these by accident. */
@@ -1542,7 +1544,8 @@ handle_response_cb(serf_request_t *reque
   svn_error_t *err;
   apr_status_t serf_status = APR_SUCCESS;
 
-  err = handle_response(request, response, ctx, &serf_status, pool);
+  err = svn_error_return(
+          handle_response(request, response, ctx, &serf_status, pool));
 
   if (err || session->pending_error)
     {
@@ -1552,10 +1555,7 @@ handle_response_cb(serf_request_t *reque
       serf_status = session->pending_error->apr_err;
     }
 
-  if (serf_status != APR_SUCCESS)
-    return serf_status;
-
-  return APR_SUCCESS;
+  return serf_status;
 }
 
 /* If the CTX->setup() callback is non-NULL, invoke it to carry out the



Mime
View raw message