diff options
Diffstat (limited to 'subversion/libsvn_ra')
| -rw-r--r-- | subversion/libsvn_ra/compat.c | 2 | ||||
| -rw-r--r-- | subversion/libsvn_ra/deprecated.c | 13 | ||||
| -rw-r--r-- | subversion/libsvn_ra/libsvn_ra.pc.in | 8 | ||||
| -rw-r--r-- | subversion/libsvn_ra/ra_loader.c | 11 | ||||
| -rw-r--r-- | subversion/libsvn_ra/ra_loader.h | 4 | ||||
| -rw-r--r-- | subversion/libsvn_ra/wrapper_template.h | 2 |
6 files changed, 29 insertions, 11 deletions
diff --git a/subversion/libsvn_ra/compat.c b/subversion/libsvn_ra/compat.c index f7307bf557a5..aba1c785d264 100644 --- a/subversion/libsvn_ra/compat.c +++ b/subversion/libsvn_ra/compat.c @@ -942,7 +942,7 @@ svn_ra__get_inherited_props_walk(svn_ra_session_t *session, parent_url, result_pool); new_iprop->prop_hash = final_hash; - svn_sort__array_insert(*inherited_props, &new_iprop, 0); + SVN_ERR(svn_sort__array_insert2(*inherited_props, &new_iprop, 0)); } } diff --git a/subversion/libsvn_ra/deprecated.c b/subversion/libsvn_ra/deprecated.c index b7e717e8429f..2612be45d82b 100644 --- a/subversion/libsvn_ra/deprecated.c +++ b/subversion/libsvn_ra/deprecated.c @@ -151,6 +151,19 @@ static svn_ra_reporter2_t reporter_3in2_wrapper = { abort_report }; +svn_error_t *svn_ra_open4(svn_ra_session_t **session_p, + const char **corrected_url_p, + const char *repos_URL, + const char *uuid, + const svn_ra_callbacks2_t *callbacks, + void *callback_baton, + apr_hash_t *config, + apr_pool_t *pool) +{ + return svn_ra_open5(session_p, corrected_url_p, NULL, repos_URL, uuid, + callbacks, callback_baton, config, pool); +} + svn_error_t *svn_ra_open3(svn_ra_session_t **session_p, const char *repos_URL, const char *uuid, diff --git a/subversion/libsvn_ra/libsvn_ra.pc.in b/subversion/libsvn_ra/libsvn_ra.pc.in index b7ef131365e5..3b44faee1d52 100644 --- a/subversion/libsvn_ra/libsvn_ra.pc.in +++ b/subversion/libsvn_ra/libsvn_ra.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libsvn_ra Description: Subversion General Repository Access Library Version: @PACKAGE_VERSION@ -Requires: apr-@SVN_APR_MAJOR_VERSION@ -Requires.private: libsvn_delta libsvn_subr -Libs: -L${libdir} -lsvn_ra -Cflags: -I${includedir} +Requires: apr-@SVN_APR_MAJOR_VERSION@ +Requires.private: libsvn_delta, libsvn_subr +Libs: -L${libdir} -lsvn_ra-1 +Cflags: -I${includedir}/subversion-1 diff --git a/subversion/libsvn_ra/ra_loader.c b/subversion/libsvn_ra/ra_loader.c index ac07545e2ba0..0fc7407e4d2e 100644 --- a/subversion/libsvn_ra/ra_loader.c +++ b/subversion/libsvn_ra/ra_loader.c @@ -256,8 +256,9 @@ svn_ra_create_callbacks(svn_ra_callbacks2_t **callbacks, return SVN_NO_ERROR; } -svn_error_t *svn_ra_open4(svn_ra_session_t **session_p, +svn_error_t *svn_ra_open5(svn_ra_session_t **session_p, const char **corrected_url_p, + const char **redirect_url_p, const char *repos_URL, const char *uuid, const svn_ra_callbacks2_t *callbacks, @@ -381,7 +382,7 @@ svn_error_t *svn_ra_open4(svn_ra_session_t **session_p, session->pool = sesspool; /* Ask the library to open the session. */ - err = vtable->open_session(session, corrected_url_p, + err = vtable->open_session(session, corrected_url_p, redirect_url_p, repos_URL, callbacks, callback_baton, auth_baton, config, sesspool, scratch_pool); @@ -406,12 +407,14 @@ svn_error_t *svn_ra_open4(svn_ra_session_t **session_p, { /* *session_p = NULL; */ *corrected_url_p = apr_pstrdup(pool, *corrected_url_p); + if (redirect_url_p && *redirect_url_p) + *redirect_url_p = apr_pstrdup(pool, *redirect_url_p); svn_pool_destroy(sesspool); /* Includes scratch_pool */ return SVN_NO_ERROR; } if (vtable->set_svn_ra_open) - SVN_ERR(vtable->set_svn_ra_open(session, svn_ra_open4)); + SVN_ERR(vtable->set_svn_ra_open(session, svn_ra_open5)); /* Check the UUID. */ if (uuid) @@ -472,7 +475,7 @@ svn_ra__dup_session(svn_ra_session_t **new_session, scratch_pool)); if (session->vtable->set_svn_ra_open) - SVN_ERR(session->vtable->set_svn_ra_open(session, svn_ra_open4)); + SVN_ERR(session->vtable->set_svn_ra_open(session, svn_ra_open5)); *new_session = session; return SVN_NO_ERROR; diff --git a/subversion/libsvn_ra/ra_loader.h b/subversion/libsvn_ra/ra_loader.h index c20b5bf92253..1cae42104bdb 100644 --- a/subversion/libsvn_ra/ra_loader.h +++ b/subversion/libsvn_ra/ra_loader.h @@ -42,6 +42,7 @@ extern "C" { handed to the ra api to allow opening other ra sessions. */ typedef svn_error_t * (*svn_ra__open_func_t)(svn_ra_session_t **session_p, const char **corrected_url, + const char **redirect_url, const char *repos_URL, const char *uuid, const svn_ra_callbacks2_t *callbacks, @@ -64,11 +65,12 @@ typedef struct svn_ra__vtable_t { /* Implementations of the public API functions. */ - /* See svn_ra_open4(). */ + /* See svn_ra_open5(). */ /* All fields in SESSION, except priv, have been initialized by the time this is called. SESSION->priv may be set by this function. */ svn_error_t *(*open_session)(svn_ra_session_t *session, const char **corrected_url, + const char **redirect_url, const char *session_URL, const svn_ra_callbacks2_t *callbacks, void *callback_baton, diff --git a/subversion/libsvn_ra/wrapper_template.h b/subversion/libsvn_ra/wrapper_template.h index 0585deda87db..a74dbf17e758 100644 --- a/subversion/libsvn_ra/wrapper_template.h +++ b/subversion/libsvn_ra/wrapper_template.h @@ -90,7 +90,7 @@ static svn_error_t *compat_open(void **session_baton, callbacks2->progress_func = NULL; callbacks2->progress_baton = NULL; - SVN_ERR(VTBL.open_session(sess, &session_url, repos_URL, + SVN_ERR(VTBL.open_session(sess, &session_url, NULL, repos_URL, callbacks2, callback_baton, callbacks ? callbacks->auth_baton : NULL, config, sesspool, sesspool)); |