You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by je...@apache.org on 2012/06/13 12:48:59 UTC

svn commit: r1349745 - /subversion/trunk/subversion/libsvn_ra_serf/util.c

Author: jerenkrantz
Date: Wed Jun 13 10:48:59 2012
New Revision: 1349745

URL: http://svn.apache.org/viewvc?rev=1349745&view=rev
Log:
Ensure that expat_response_handler deals with all of the transient errors
correctly.

* subversion/libsvn_ra_serf/util.c
  (expat_response_handler): All error codes that are transient should be
  bubbled up - not just EAGAIN & EOF.

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=1349745&r1=1349744&r2=1349745&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Wed Jun 13 10:48:59 2012
@@ -2427,9 +2427,6 @@ expat_response_handler(serf_request_t *r
 
       /* The parsing went fine. What has the bucket told us?  */
 
-      if (APR_STATUS_IS_EAGAIN(status))
-        return svn_error_wrap_apr(status, NULL);
-
       if (APR_STATUS_IS_EOF(status))
         {
           /* Tell expat we've reached the end of the content. Ignore the
@@ -2441,7 +2438,10 @@ expat_response_handler(serf_request_t *r
 
           /* ### should check XMLCTX to see if it has returned to the
              ### INITIAL state. we may have ended early...  */
+        }
 
+      if (status && !SERF_BUCKET_READ_ERROR(status))
+        {
           return svn_error_wrap_apr(status, NULL);
         }
     }