← Back to branch summary

~svn/ubuntu/oneiric/subversion/ppa

« back to all changes in this revision

Viewing changes to subversion/libsvn_ra_serf/commit.c

  • Committer: Max Bowsher
  • Date: 2011-01-05 22:59:03 UTC
  • mfrom: (1.5.4 upstream)
  • Revision ID: maxb@f2s.com-20110105225903-8g49kyyh5zyqh5iw
Merge new upstream 1.6.15.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_ra_serf/commit.c
1169
1169
    {
1170
1170
      svn_error_clear(err);
1171
1171
 
 
1172
#if SERF_VERSION_AT_LEAST(0, 4, 0)
 
1173
      /* An error has been registered on the connection. Reset the thing
 
1174
         so that we can use it again.  */
 
1175
      serf_connection_reset(handler->conn->conn);
 
1176
#endif
 
1177
 
1172
1178
      handler->body_delegate = create_delete_body;
1173
1179
      handler->body_delegate_baton = delete_ctx;
1174
1180
      handler->body_type = "text/xml";
1873
1879
  if (! ctx->activity_url)
1874
1880
    return SVN_NO_ERROR;
1875
1881
 
 
1882
#if SERF_VERSION_AT_LEAST(0, 4, 0)
 
1883
  /* An error occurred on conns[0]. serf 0.4.0 remembers that the connection
 
1884
     had a problem. We need to reset it, in order to use it again.  */
 
1885
  serf_connection_reset(ctx->session->conns[0]->conn);
 
1886
#endif
 
1887
 
1876
1888
  /* DELETE our aborted activity */
1877
1889
  handler = apr_pcalloc(pool, sizeof(*handler));
1878
1890
  handler->method = "DELETE";