svn commit: r987694 - /subversion/branches/1.6.x-r879757/subversion/libsvn_ra_serf/commit.c

[je...@apache.org]

Author: jerenkrantz
Date: Sat Aug 21 05:01:00 2010
New Revision: 987694

URL: http://svn.apache.org/viewvc?rev=987694&view=rev
Log:
Backport r943796 to this branch as this is the other API change introduced
in 0.4.0.

Modified:
    subversion/branches/1.6.x-r879757/subversion/libsvn_ra_serf/commit.c

Modified: subversion/branches/1.6.x-r879757/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-r879757/subversion/libsvn_ra_serf/commit.c?rev=987694&r1=987693&r2=987694&view=diff
==============================================================================
--- subversion/branches/1.6.x-r879757/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/1.6.x-r879757/subversion/libsvn_ra_serf/commit.c Sat Aug 21 05:01:00 2010
@@ -1169,6 +1169,12 @@ delete_entry(const char *path,
     {
       svn_error_clear(err);
 
+#if SERF_VERSION_AT_LEAST(0, 4, 0)
+      /* An error has been registered on the connection. Reset the thing
+         so that we can use it again.  */
+      serf_connection_reset(handler->conn->conn);
+#endif
+
       handler->body_delegate = create_delete_body;
       handler->body_delegate_baton = delete_ctx;
       handler->body_type = "text/xml";
@@ -1873,6 +1879,12 @@ abort_edit(void *edit_baton,
   if (! ctx->activity_url)
     return SVN_NO_ERROR;
 
+#if SERF_VERSION_AT_LEAST(0, 4, 0)
+  /* An error occurred on conns[0]. serf 0.4.0 remembers that the connection
+     had a problem. We need to reset it, in order to use it again.  */
+  serf_connection_reset(ctx->session->conns[0]->conn);
+#endif
+
   /* DELETE our aborted activity */
   handler = apr_pcalloc(pool, sizeof(*handler));
   handler->method = "DELETE";