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 2013/12/29 00:18:19 UTC
svn commit: r1553966 - in /subversion/trunk/subversion:
libsvn_ra_serf/merge.c libsvn_ra_serf/ra_serf.h mod_dav_svn/repos.c
Author: rhuijben
Date: Sat Dec 28 23:18:19 2013
New Revision: 1553966
URL: http://svn.apache.org/r1553966
Log:
Make a libsvn_ra_serf api that used to be in use using DELETE processing
static.
* subversion/libsvn_ra_serf/merge.c
(svn_ra_serf__merge_lock_token_list): Rename to ...
(merge_lock_token_list): ... this.
(create_merge_body): Update caller.
* subversion/libsvn_ra_serf/ra_serf.h
(svn_ra_serf__merge_lock_token_list): Remove prototype.
* subversion/mod_dav_svn/repos.c
(remove_resource): Tweak comment.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/merge.c
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
subversion/trunk/subversion/mod_dav_svn/repos.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/merge.c?rev=1553966&r1=1553965&r2=1553966&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/merge.c Sat Dec 28 23:18:19 2013
@@ -279,12 +279,12 @@ setup_merge_headers(serf_bucket_t *heade
return SVN_NO_ERROR;
}
-void
-svn_ra_serf__merge_lock_token_list(apr_hash_t *lock_tokens,
- const char *parent,
- serf_bucket_t *body,
- serf_bucket_alloc_t *alloc,
- apr_pool_t *pool)
+static void
+merge_lock_token_list(apr_hash_t *lock_tokens,
+ const char *parent,
+ serf_bucket_t *body,
+ serf_bucket_alloc_t *alloc,
+ apr_pool_t *pool)
{
apr_hash_index_t *hi;
@@ -363,8 +363,7 @@ create_merge_body(serf_bucket_t **bkt,
svn_ra_serf__add_tag_buckets(body_bkt, "D:creator-displayname", NULL, alloc);
svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, "D:prop");
- svn_ra_serf__merge_lock_token_list(ctx->lock_tokens, NULL, body_bkt, alloc,
- pool);
+ merge_lock_token_list(ctx->lock_tokens, NULL, body_bkt, alloc, pool);
svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, "D:merge");
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=1553966&r1=1553965&r2=1553966&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Sat Dec 28 23:18:19 2013
@@ -1353,13 +1353,6 @@ svn_ra_serf__get_resource_type(svn_node_
/** MERGE-related functions **/
-void
-svn_ra_serf__merge_lock_token_list(apr_hash_t *lock_tokens,
- const char *parent,
- serf_bucket_t *body,
- serf_bucket_alloc_t *alloc,
- apr_pool_t *pool);
-
/* Create an MERGE request aimed at the SESSION url, requesting the
merge of the resource identified by MERGE_RESOURCE_URL.
LOCK_TOKENS is a hash mapping paths to lock tokens owned by the
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1553966&r1=1553965&r2=1553966&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Sat Dec 28 23:18:19 2013
@@ -3938,8 +3938,9 @@ remove_resource(dav_resource *resource,
incoming lock-tokens into the filesystem's access_t. Normally
they come in via 'If:' header, and get_resource()
automatically notices them and does this work for us. In the
- case of a directory deletion, however, svn clients are sending
- 'child' lock-tokens in the DELETE request body. */
+ case of a directory deletion, however, older subversion clients
+ are sending 'child' lock-tokens in the non-standard DELETE
+ request body. */
err = dav_svn__build_lock_hash(&locks, resource->info->r,
resource->info->repos_path, resource->pool);