You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/03/28 05:00:30 UTC
svn commit: r1461944 - in /subversion/branches/1.7.x: ./ STATUS
subversion/mod_dav_svn/liveprops.c
Author: svn-role
Date: Thu Mar 28 04:00:30 2013
New Revision: 1461944
URL: http://svn.apache.org/r1461944
Log:
Merge r1453780 from trunk:
* r1453780
Reject operations on some properties for activity resources.
Justification:
It's a SEGV.
Votes:
+1: philip, breser, stefan2
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/mod_dav_svn/liveprops.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1453780
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1461944&r1=1461943&r2=1461944&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Mar 28 04:00:30 2013
@@ -280,13 +280,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1453780
- Reject operations on some properties for activity resources.
- Justification:
- It's a SEGV.
- Votes:
- +1: philip, breser, stefan2
-
* ^/subversion/branches/1.7.x-neon-properr
Justification:
Error messages which refer to "date" and "author" (when they mean
Modified: subversion/branches/1.7.x/subversion/mod_dav_svn/liveprops.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/mod_dav_svn/liveprops.c?rev=1461944&r1=1461943&r2=1461944&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/mod_dav_svn/liveprops.c (original)
+++ subversion/branches/1.7.x/subversion/mod_dav_svn/liveprops.c Thu Mar 28 04:00:30 2013
@@ -429,7 +429,8 @@ insert_prop_internal(const dav_resource
svn_filesize_t len = 0;
/* our property, but not defined on collection resources */
- if (resource->collection || resource->baselined)
+ if (resource->type == DAV_RESOURCE_TYPE_ACTIVITY
+ || resource->collection || resource->baselined)
return DAV_PROP_INSERT_NOTSUPP;
serr = svn_fs_file_length(&len, resource->info->root.root,
@@ -453,7 +454,9 @@ insert_prop_internal(const dav_resource
svn_string_t *pval;
const char *mime_type = NULL;
- if (resource->baselined && resource->type == DAV_RESOURCE_TYPE_VERSION)
+ if (resource->type == DAV_RESOURCE_TYPE_ACTIVITY
+ || (resource->baselined
+ && resource->type == DAV_RESOURCE_TYPE_VERSION))
return DAV_PROP_INSERT_NOTSUPP;
if (resource->type == DAV_RESOURCE_TYPE_PRIVATE