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

[rh...@apache.org]

Author: rhuijben
Date: Thu Aug  5 20:12:58 2010
New Revision: 982761

URL: http://svn.apache.org/viewvc?rev=982761&view=rev
Log:
Following up on r982512, resolve two error handling issues in serf's
handle_response handler.

* subversion/libsvn_ra_serf/util.c
  (handle_response): Don't hook the existing pending error as
     handle_response_cb will do that for us. When performing
     authorization properly return the discard status.
     (This discarding made authorization fail with serf 0.3.1)

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=982761&r1=982760&r2=982761&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Thu Aug  5 20:12:58 2010
@@ -1428,9 +1428,7 @@ handle_response(serf_request_t *request,
         {
           svn_error_t *err =
               svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA,
-                                svn_error_compose_create(
-                                           ctx->session->pending_error,
-                                           svn_error_wrap_apr(status, NULL)),
+                                svn_error_wrap_apr(status, NULL),
                                 _("Premature EOF seen from server "
                                   "(http status=%d)"), sl.code);
           /* This discard may be no-op, but let's preserve the algorithm
@@ -1470,6 +1468,7 @@ handle_response(serf_request_t *request,
 
       svn_ra_serf__priority_request_create(ctx);
 
+      *serf_status = status;
       return SVN_NO_ERROR;
     }
   else if (sl.code == 409 || sl.code >= 500)