subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1656689 - in /subversion/trunk/subversion/libsvn_ra_serf: get_file.c serf.c
Date Tue, 03 Feb 2015 11:37:20 GMT
Author: rhuijben
Date: Tue Feb  3 11:37:20 2015
New Revision: 1656689

URL: http://svn.apache.org/r1656689
Log:
When duplicating an ra_session in ra_serf, properly reset the current
connection to 0 (as initially there is only a single connection)

* subversion/libsvn_ra_serf/get_file.c
  (svn_ra_serf__get_file): Use the same connection for the PROPFIND
    and GET requests, even when there are multiple connections.

* subversion/libsvn_ra_serf/serf.c
  (ra_serf_dup_session): Set cur_connection to 0, to avoid problems when
    the original session used multiple connections.

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/get_file.c
    subversion/trunk/subversion/libsvn_ra_serf/serf.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/get_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/get_file.c?rev=1656689&r1=1656688&r2=1656689&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/get_file.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/get_file.c Tue Feb  3 11:37:20 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/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1656689&r1=1656688&r2=1656689&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Tue Feb  3 11:37:20 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;
 



Mime
View raw message