Author: brane
Date: Tue Feb 3 11:44:54 2015
New Revision: 1656690
URL: http://svn.apache.org/r1656690
Log:
On the reuse-ra-session branch: Sync with trunk up to r1656689.
Modified:
subversion/branches/reuse-ra-session/ (props changed)
subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/get_file.c
subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/serf.c
Propchange: subversion/branches/reuse-ra-session/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 3 11:44:54 2015
@@ -86,4 +86,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1501802-1656516
+/subversion/trunk:1501802-1656689
Modified:
subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/get_file.c
URL:
http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/get_file.c?rev=1656690&r1=1656689&r2=1656690&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/get_file.c
(original)
+++ subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/get_file.c
Tue Feb 3 11:44:54 2015
@@ -397,9 +397,6 @@ svn_ra_serf__get_file(svn_ra_session_t *
handler = svn_ra_serf__create_handler(session, pool);
- /* What connection should we go on? */
- handler->conn = session->conns[session->cur_conn];
-
handler->method = "GET";
handler->path = fetch_url;
Modified: subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/serf.c
URL:
http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/serf.c?rev=1656690&r1=1656689&r2=1656690&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/serf.c
(original)
+++ subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/serf.c Tue
Feb 3 11:44:54 2015
@@ -776,6 +776,7 @@ ra_serf_dup_session(svn_ra_session_t *ne
new_sess);
new_sess->num_conns = 1;
+ new_sess->cur_conn = 0;
new_session->priv = new_sess;