Author: svn-role
Date: Thu Mar 28 04:00:25 2013
New Revision: 1461943
URL: http://svn.apache.org/r1461943
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.6.x/ (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/mod_dav_svn/liveprops.c
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1453780
Modified: subversion/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1461943&r1=1461942&r2=1461943&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Thu Mar 28 04:00:25 2013
@@ -93,10 +93,3 @@ Veto-blocked changes:
Approved changes:
=================
- * r1453780
- Reject operations on some properties for activity resources.
- Justification:
- It's a SEGV.
- Votes:
- +1: philip, breser, stefan2
-
Modified: subversion/branches/1.6.x/subversion/mod_dav_svn/liveprops.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/mod_dav_svn/liveprops.c?rev=1461943&r1=1461942&r2=1461943&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/mod_dav_svn/liveprops.c (original)
+++ subversion/branches/1.6.x/subversion/mod_dav_svn/liveprops.c Thu Mar 28
04:00:25 2013
@@ -410,7 +410,8 @@ insert_prop(const dav_resource *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,
@@ -434,7 +435,9 @@ insert_prop(const dav_resource *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
