You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2014/03/18 14:42:53 UTC
svn commit: r1578885 - in /subversion/branches/1.8.x-r1578853: ./
subversion/libsvn_ra_svn/protocol subversion/svnserve/serve.c
Author: philip
Date: Tue Mar 18 13:42:53 2014
New Revision: 1578885
URL: http://svn.apache.org/r1578885
Log:
On 1.8.x-r1578853 branch, merge r1578853 and r1578875 and resolve text conflict.
Modified:
subversion/branches/1.8.x-r1578853/ (props changed)
subversion/branches/1.8.x-r1578853/subversion/libsvn_ra_svn/protocol
subversion/branches/1.8.x-r1578853/subversion/svnserve/serve.c
Propchange: subversion/branches/1.8.x-r1578853/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1578853,1578875
Modified: subversion/branches/1.8.x-r1578853/subversion/libsvn_ra_svn/protocol
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1578853/subversion/libsvn_ra_svn/protocol?rev=1578885&r1=1578884&r2=1578885&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1578853/subversion/libsvn_ra_svn/protocol (original)
+++ subversion/branches/1.8.x-r1578853/subversion/libsvn_ra_svn/protocol Tue Mar 18 13:42:53 2014
@@ -310,6 +310,7 @@ second place for auth-request point as n
sends file contents as a series of strings, terminated by the empty
string, followed by a second empty command response to indicate
whether an error occurred during the sending of the file.
+ NOTE: the standard client never sends want-iprops, it uses get-iprops.
get-dir
params: ( path:string [ rev:number ] want-props:bool want-contents:bool
@@ -321,6 +322,7 @@ second place for auth-request point as n
[ last-author:string ] )
dirent-field: kind | size | has-props | created-rev | time | last-author
| word
+ NOTE: the standard client never sends want-iprops, it uses get-iprops.
check-path
params: ( path:string [ rev:number ] )
Modified: subversion/branches/1.8.x-r1578853/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1578853/subversion/svnserve/serve.c?rev=1578885&r1=1578884&r2=1578885&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1578853/subversion/svnserve/serve.c (original)
+++ subversion/branches/1.8.x-r1578853/subversion/svnserve/serve.c Tue Mar 18 13:42:53 2014
@@ -1526,6 +1526,9 @@ static svn_error_t *get_file(svn_ra_svn_
&want_props, &want_contents,
&wants_inherited_props));
+ if (wants_inherited_props == SVN_RA_SVN_UNSPECIFIED_NUMBER)
+ wants_inherited_props = FALSE;
+
full_path = svn_fspath__join(b->fs_path->data,
svn_relpath_canonicalize(path, pool), pool);
@@ -1545,8 +1548,14 @@ static svn_error_t *get_file(svn_ra_svn_
SVN_CMD_ERR(svn_fs_file_checksum(&checksum, svn_checksum_md5, root,
full_path, TRUE, pool));
hex_digest = svn_checksum_to_cstring_display(checksum, pool);
+
+ /* Fetch the file's explicit and/or inherited properties if
+ requested. Although the wants-iprops boolean was added to the
+ protocol in 1.8 a standard 1.8 client never requests iprops. */
if (want_props || wants_inherited_props)
- SVN_CMD_ERR(get_props(&props, &inherited_props, &ab, root, full_path,
+ SVN_CMD_ERR(get_props(want_props ? &props : NULL,
+ wants_inherited_props ? &inherited_props : NULL,
+ &ab, root, full_path,
pool));
if (want_contents)
SVN_CMD_ERR(svn_fs_file_contents(&contents, root, full_path, pool));
@@ -1640,6 +1649,9 @@ static svn_error_t *get_dir(svn_ra_svn_c
&dirent_fields_list,
&wants_inherited_props));
+ if (wants_inherited_props == SVN_RA_SVN_UNSPECIFIED_NUMBER)
+ wants_inherited_props = FALSE;
+
if (! dirent_fields_list)
{
dirent_fields = SVN_DIRENT_ALL;
@@ -1689,10 +1701,13 @@ static svn_error_t *get_dir(svn_ra_svn_c
/* Fetch the root of the appropriate revision. */
SVN_CMD_ERR(svn_fs_revision_root(&root, b->fs, rev, pool));
- /* Fetch the directory's explicit and/or inherited properties
- if requested. */
+ /* Fetch the directory's explicit and/or inherited properties if
+ requested. Although the wants-iprops boolean was added to the
+ protocol in 1.8 a standard 1.8 client never requests iprops. */
if (want_props || wants_inherited_props)
- SVN_CMD_ERR(get_props(&props, &inherited_props, &ab, root, full_path,
+ SVN_CMD_ERR(get_props(want_props ? &props : NULL,
+ wants_inherited_props ? &inherited_props : NULL,
+ &ab, root, full_path,
pool));
/* Begin response ... */