You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/01/25 17:50:00 UTC
svn commit: r1654668 - /subversion/trunk/subversion/libsvn_ra_serf/
Author: rhuijben
Date: Sun Jan 25 16:49:59 2015
New Revision: 1654668
URL: http://svn.apache.org/r1654668
Log:
Make the session an argument of svn_ra_serf__create_expat_handler.
* subversion/libsvn_ra_serf/blame.c
(svn_ra_serf__get_file_revs): Update caller.
* subversion/libsvn_ra_serf/getdate.c
(svn_ra_serf__get_dated_revision): Update caller.
* subversion/libsvn_ra_serf/getlocations.c
(svn_ra_serf__get_locations): Update caller.
* subversion/libsvn_ra_serf/getlocationsegments.c
(svn_ra_serf__get_location_segments): Update caller.
* subversion/libsvn_ra_serf/getlocks.c
(svn_ra_serf__get_locks): Update caller.
* subversion/libsvn_ra_serf/get_deleted_rev.c
(svn_ra_serf__get_deleted_rev): Update caller.
* subversion/libsvn_ra_serf/get_lock.c
(svn_ra_serf__get_lock): Update caller.
* subversion/libsvn_ra_serf/inherited_props.c
(svn_ra_serf__get_inherited_props): Update caller.
* subversion/libsvn_ra_serf/lock.c
(svn_ra_serf__lock): Update caller.
* subversion/libsvn_ra_serf/log.c
(svn_ra_serf__get_log): Update caller.
* subversion/libsvn_ra_serf/merge.c
(svn_ra_serf__run_merge): Remove argument. Update caller.
* subversion/libsvn_ra_serf/mergeinfo.c
(svn_ra_serf__get_mergeinfo): Update caller.
* subversion/libsvn_ra_serf/multistatus.c
(svn_ra_serf__setup_error_parsing): Update caller.
* subversion/libsvn_ra_serf/options.c
(create_options_req): Update caller.
* subversion/libsvn_ra_serf/property.c
(svn_ra_serf__create_propfind_handler): Update caller.
* subversion/libsvn_ra_serf/ra_serf.h
(svn_ra_serf__create_expat_handler): Add argument.
(svn_ra_serf__run_merge): Remove argument.
* subversion/libsvn_ra_serf/replay.c
(svn_ra_serf__replay,
svn_ra_serf__replay_range): Update caller.
* subversion/libsvn_ra_serf/update.c
(finish_report): Update caller.
* subversion/libsvn_ra_serf/xml.c
(svn_ra_serf__create_expat_handler): Set session and conn from new argument.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/blame.c
subversion/trunk/subversion/libsvn_ra_serf/commit.c
subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c
subversion/trunk/subversion/libsvn_ra_serf/get_lock.c
subversion/trunk/subversion/libsvn_ra_serf/getdate.c
subversion/trunk/subversion/libsvn_ra_serf/getlocations.c
subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/trunk/subversion/libsvn_ra_serf/getlocks.c
subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c
subversion/trunk/subversion/libsvn_ra_serf/lock.c
subversion/trunk/subversion/libsvn_ra_serf/log.c
subversion/trunk/subversion/libsvn_ra_serf/merge.c
subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c
subversion/trunk/subversion/libsvn_ra_serf/multistatus.c
subversion/trunk/subversion/libsvn_ra_serf/options.c
subversion/trunk/subversion/libsvn_ra_serf/property.c
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
subversion/trunk/subversion/libsvn_ra_serf/replay.c
subversion/trunk/subversion/libsvn_ra_serf/update.c
subversion/trunk/subversion/libsvn_ra_serf/xml.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/blame.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/blame.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/blame.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/blame.c Sun Jan 25 16:49:59 2015
@@ -362,15 +362,13 @@ svn_ra_serf__get_file_revs(svn_ra_sessio
blame_cdata,
blame_ctx,
pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL, pool);
handler->method = "REPORT";
handler->path = req_url;
handler->body_type = "text/xml";
handler->body_delegate = create_file_revs_body;
handler->body_delegate_baton = blame_ctx;
- handler->conn = session->conns[0];
- handler->session = session;
SVN_ERR(svn_ra_serf__context_run_one(handler, pool));
Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Sun Jan 25 16:49:59 2015
@@ -2001,7 +2001,6 @@ close_edit(void *edit_baton,
/* MERGE our activity */
SVN_ERR(svn_ra_serf__run_merge(&commit_info,
ctx->session,
- ctx->session->conns[0],
merge_target,
ctx->lock_tokens,
ctx->keep_locks,
Modified: subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c Sun Jan 25 16:49:59 2015
@@ -156,15 +156,13 @@ svn_ra_serf__get_deleted_rev(svn_ra_sess
NULL, getdrev_closed, NULL,
drev_ctx,
pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, pool);
+ handler = svn_ra_serf__create_expat_handler(ras, xmlctx, NULL, pool);
handler->method = "REPORT";
handler->path = req_url;
handler->body_type = "text/xml";
handler->body_delegate = create_getdrev_body;
handler->body_delegate_baton = drev_ctx;
- handler->conn = ras->conns[0];
- handler->session = ras;
err = svn_ra_serf__context_run_one(handler, pool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/get_lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/get_lock.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/get_lock.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/get_lock.c Sun Jan 25 16:49:59 2015
@@ -291,14 +291,13 @@ svn_ra_serf__get_lock(svn_ra_session_t *
NULL, locks_closed, NULL,
lock_ctx,
scratch_pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, locks_expected_status,
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx,
+ locks_expected_status,
scratch_pool);
handler->method = "PROPFIND";
handler->path = req_url;
handler->body_type = "text/xml";
- handler->conn = session->conns[0];
- handler->session = session;
handler->body_delegate = create_getlock_body;
handler->body_delegate_baton = lock_ctx;
Modified: subversion/trunk/subversion/libsvn_ra_serf/getdate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getdate.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getdate.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getdate.c Sun Jan 25 16:49:59 2015
@@ -146,13 +146,11 @@ svn_ra_serf__get_dated_revision(svn_ra_s
NULL, date_closed, NULL,
date_ctx,
pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL, pool);
handler->method = "REPORT";
handler->path = report_target;
handler->body_type = "text/xml";
- handler->conn = session->conns[0];
- handler->session = session;
handler->body_delegate = create_getdate_body;
handler->body_delegate_baton = date_ctx;
Modified: subversion/trunk/subversion/libsvn_ra_serf/getlocations.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getlocations.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getlocations.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getlocations.c Sun Jan 25 16:49:59 2015
@@ -183,15 +183,13 @@ svn_ra_serf__get_locations(svn_ra_sessio
NULL, getloc_closed, NULL,
loc_ctx,
pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL, pool);
handler->method = "REPORT";
handler->path = req_url;
handler->body_delegate = create_get_locations_body;
handler->body_delegate_baton = loc_ctx;
handler->body_type = "text/xml";
- handler->conn = session->conns[0];
- handler->session = session;
SVN_ERR(svn_ra_serf__context_run_one(handler, pool));
Modified: subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c Sun Jan 25 16:49:59 2015
@@ -186,7 +186,7 @@ svn_ra_serf__get_location_segments(svn_r
NULL, gls_closed, NULL,
gls_ctx,
pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL, pool);
handler->method = "REPORT";
handler->path = req_url;
Modified: subversion/trunk/subversion/libsvn_ra_serf/getlocks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getlocks.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getlocks.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getlocks.c Sun Jan 25 16:49:59 2015
@@ -257,13 +257,11 @@ svn_ra_serf__get_locks(svn_ra_session_t
NULL, getlocks_closed, NULL,
lock_ctx,
pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL, pool);
handler->method = "REPORT";
handler->path = req_url;
handler->body_type = "text/xml";
- handler->conn = session->conns[0];
- handler->session = session;
handler->body_delegate = create_getlocks_body;
handler->body_delegate_baton = lock_ctx;
Modified: subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c Sun Jan 25 16:49:59 2015
@@ -423,12 +423,12 @@ svn_ra_serf__get_inherited_props(svn_ra_
NULL,
iprops_ctx,
scratch_pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, scratch_pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL,
+ scratch_pool);
handler->method = "REPORT";
handler->path = req_url;
- handler->conn = session->conns[0];
- handler->session = session;
+
handler->body_delegate = create_iprops_body;
handler->body_delegate_baton = iprops_ctx;
handler->body_type = "text/xml";
Modified: subversion/trunk/subversion/libsvn_ra_serf/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/lock.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/lock.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/lock.c Sun Jan 25 16:49:59 2015
@@ -484,7 +484,8 @@ svn_ra_serf__lock(svn_ra_session_t *ra_s
NULL, locks_closed, NULL,
lock_ctx,
lock_pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, lock_pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL,
+ lock_pool);
handler->method = "LOCK";
handler->path = req_url;
@@ -497,8 +498,6 @@ svn_ra_serf__lock(svn_ra_session_t *ra_s
if (session->cur_conn >= session->num_conns)
session->cur_conn = 0;
- handler->session = session;
-
handler->header_delegate = set_lock_headers;
handler->header_delegate_baton = lock_ctx;
Modified: subversion/trunk/subversion/libsvn_ra_serf/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/log.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/log.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/log.c Sun Jan 25 16:49:59 2015
@@ -588,15 +588,13 @@ svn_ra_serf__get_log(svn_ra_session_t *r
log_opened, log_closed, NULL,
log_ctx,
pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL, pool);
handler->method = "REPORT";
handler->path = req_url;
handler->body_delegate = create_log_body;
handler->body_delegate_baton = log_ctx;
handler->body_type = "text/xml";
- handler->conn = session->conns[0];
- handler->session = session;
SVN_ERR(svn_ra_serf__context_run_one(handler, pool));
Modified: subversion/trunk/subversion/libsvn_ra_serf/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/merge.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/merge.c Sun Jan 25 16:49:59 2015
@@ -391,7 +391,6 @@ create_merge_body(serf_bucket_t **bkt,
svn_error_t *
svn_ra_serf__run_merge(const svn_commit_info_t **commit_info,
svn_ra_serf__session_t *session,
- svn_ra_serf__connection_t *conn,
const char *merge_resource_url,
apr_hash_t *lock_tokens,
svn_boolean_t keep_locks,
@@ -420,14 +419,13 @@ svn_ra_serf__run_merge(const svn_commit_
NULL, merge_closed, NULL,
merge_ctx,
scratch_pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, scratch_pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL,
+ scratch_pool);
handler->method = "MERGE";
handler->path = merge_ctx->merge_url;
handler->body_delegate = create_merge_body;
handler->body_delegate_baton = merge_ctx;
- handler->conn = conn;
- handler->session = session;
handler->header_delegate = setup_merge_headers;
handler->header_delegate_baton = merge_ctx;
Modified: subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c Sun Jan 25 16:49:59 2015
@@ -217,12 +217,11 @@ svn_ra_serf__get_mergeinfo(svn_ra_sessio
NULL, mergeinfo_closed, NULL,
mergeinfo_ctx,
pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL, pool);
handler->method = "REPORT";
handler->path = path;
- handler->conn = session->conns[0];
- handler->session = session;
+
handler->body_delegate = create_mergeinfo_body;
handler->body_delegate_baton = mergeinfo_ctx;
handler->body_type = "text/xml";
Modified: subversion/trunk/subversion/libsvn_ra_serf/multistatus.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/multistatus.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/multistatus.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/multistatus.c Sun Jan 25 16:49:59 2015
@@ -619,7 +619,8 @@ svn_ra_serf__setup_error_parsing(svn_ra_
ms_baton,
ms_baton->pool);
- tmp_handler = svn_ra_serf__create_expat_handler(ms_baton->xmlctx,
+ tmp_handler = svn_ra_serf__create_expat_handler(handler->session,
+ ms_baton->xmlctx,
expected_status,
result_pool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/options.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/options.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/options.c Sun Jan 25 16:49:59 2015
@@ -405,14 +405,12 @@ create_options_req(options_context_t **o
NULL, options_closed, NULL,
new_ctx,
pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL, pool);
handler->method = "OPTIONS";
handler->path = session->session_url.path;
handler->body_delegate = create_options_body;
handler->body_type = "text/xml";
- handler->conn = session->conns[0];
- handler->session = session;
new_ctx->handler = handler;
Modified: subversion/trunk/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/property.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/property.c Sun Jan 25 16:49:59 2015
@@ -483,7 +483,7 @@ svn_ra_serf__create_propfind_handler(svn
NULL,
new_prop_ctx,
pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx,
+ handler = svn_ra_serf__create_expat_handler(sess, xmlctx,
propfind_expected_status,
pool);
@@ -495,9 +495,6 @@ svn_ra_serf__create_propfind_handler(svn
handler->header_delegate = setup_propfind_headers;
handler->header_delegate_baton = new_prop_ctx;
- handler->session = sess;
- handler->conn = sess->conns[0];
-
new_prop_ctx->handler = handler;
*propfind_handler = handler;
Modified: subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Sun Jan 25 16:49:59 2015
@@ -685,7 +685,8 @@ svn_ra_serf__xml_context_done(svn_ra_ser
This also initializes HANDLER_POOL to the given RESULT_POOL. */
svn_ra_serf__handler_t *
-svn_ra_serf__create_expat_handler(svn_ra_serf__xml_context_t *xmlctx,
+svn_ra_serf__create_expat_handler(svn_ra_serf__session_t *session,
+ svn_ra_serf__xml_context_t *xmlctx,
const int *expected_status,
apr_pool_t *result_pool);
@@ -1079,7 +1080,6 @@ svn_ra_serf__get_resource_type(svn_node_
svn_error_t *
svn_ra_serf__run_merge(const svn_commit_info_t **commit_info,
svn_ra_serf__session_t *session,
- svn_ra_serf__connection_t *conn,
const char *merge_resource_url,
apr_hash_t *lock_tokens,
svn_boolean_t keep_locks,
Modified: subversion/trunk/subversion/libsvn_ra_serf/replay.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/replay.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/replay.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/replay.c Sun Jan 25 16:49:59 2015
@@ -552,15 +552,14 @@ svn_ra_serf__replay(svn_ra_session_t *ra
&ctx,
scratch_pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, scratch_pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL,
+ scratch_pool);
handler->method = "REPORT";
handler->path = session->session_url.path;
handler->body_delegate = create_replay_body;
handler->body_delegate_baton = &ctx;
handler->body_type = "text/xml";
- handler->conn = session->conns[0];
- handler->session = session;
/* Not setting up done handler as we don't use a global context */
@@ -750,14 +749,13 @@ svn_ra_serf__replay_range(svn_ra_session
replay_cdata, rev_ctx,
rev_pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, rev_pool);
+ handler = svn_ra_serf__create_expat_handler(session, xmlctx, NULL,
+ rev_pool);
handler->method = "REPORT";
handler->path = replay_target;
handler->body_delegate = create_replay_body;
handler->body_delegate_baton = rev_ctx;
- handler->conn = session->conns[0];
- handler->session = session;
handler->done_delegate = replay_done;
handler->done_delegate_baton = rev_ctx;
Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/update.c Sun Jan 25 16:49:59 2015
@@ -2664,7 +2664,8 @@ finish_report(void *report_baton,
update_cdata,
report,
scratch_pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, NULL, scratch_pool);
+ handler = svn_ra_serf__create_expat_handler(sess, xmlctx, NULL,
+ scratch_pool);
handler->method = "REPORT";
handler->path = report_target;
@@ -2674,8 +2675,6 @@ finish_report(void *report_baton,
handler->custom_accept_encoding = TRUE;
handler->header_delegate = setup_update_report_headers;
handler->header_delegate_baton = report;
- handler->conn = sess->conns[0];
- handler->session = sess;
svn_ra_serf__request_create(handler);
Modified: subversion/trunk/subversion/libsvn_ra_serf/xml.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/xml.c?rev=1654668&r1=1654667&r2=1654668&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/xml.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/xml.c Sun Jan 25 16:49:59 2015
@@ -1087,7 +1087,8 @@ expat_response_handler(serf_request_t *r
svn_ra_serf__handler_t *
-svn_ra_serf__create_expat_handler(svn_ra_serf__xml_context_t *xmlctx,
+svn_ra_serf__create_expat_handler(svn_ra_serf__session_t *session,
+ svn_ra_serf__xml_context_t *xmlctx,
const int *expected_status,
apr_pool_t *result_pool)
{
@@ -1104,6 +1105,9 @@ svn_ra_serf__create_expat_handler(svn_ra
handler->response_handler = expat_response_handler;
handler->response_baton = ectx;
+ handler->session = session;
+ handler->conn = session->conns[0];
+
ectx->handler = handler;
return handler;