You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2017/08/24 13:21:44 UTC
svn commit: r1806044 - /subversion/trunk/subversion/libsvn_ra_serf/merge.c
Author: kotkov
Date: Thu Aug 24 13:21:44 2017
New Revision: 1806044
URL: http://svn.apache.org/viewvc?rev=1806044&view=rev
Log:
* subversion/libsvn_ra_serf/merge.c
(setup_merge_headers): Don't send the empty X-SVN-Options header when
no special MERGE options are required.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/merge.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=1806044&r1=1806043&r2=1806044&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/merge.c Thu Aug 24 13:21:44 2017
@@ -284,8 +284,9 @@ setup_merge_headers(serf_bucket_t *heade
if (ctx->disable_merge_response)
APR_ARRAY_PUSH(vals, const char *) = SVN_DAV_OPTION_NO_MERGE_RESPONSE;
- serf_bucket_headers_set(headers, SVN_DAV_OPTIONS_HEADER,
- svn_cstring_join2(vals, " ", FALSE, scratch_pool));
+ if (vals->nelts > 0)
+ serf_bucket_headers_set(headers, SVN_DAV_OPTIONS_HEADER,
+ svn_cstring_join2(vals, " ", FALSE, scratch_pool));
return SVN_NO_ERROR;
}