nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-19 01:34:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cannot-modify-protected-property should be used with 403 Forbidden, not 409 Conflict

Browse Source 
see the end of https://tools.ietf.org/html/rfc4918#section-16 (WebDAV,
Precondition/Postcondition XML Elements)
This commit is contained in:
Florian Schlichting 2017-03-29 11:22:44 +02:00
parent fb4f80d4c1
commit 4cf6628ea5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/caldav-PROPPATCH.php
View File

@ -212,7 +212,7 @@ foreach( $setprops AS $k => $setting ) {
case 'DAV::creationdate': case 'DAV::creationdate':
case 'DAV::lockdiscovery': case 'DAV::lockdiscovery':
case 'DAV::supportedlock': case 'DAV::supportedlock':
add_failure('set', $tag, 'HTTP/1.1 409 Conflict', translate("Property is read-only"), 'cannot-modify-protected-property'); add_failure('set', $tag, 'HTTP/1.1 403 Forbidden', translate("Property is read-only"), 'cannot-modify-protected-property');
break; break;
/** /**
@ -233,7 +233,7 @@ foreach( $rmprops AS $k => $setting ) {
switch( $tag ) { switch( $tag ) {
case 'DAV::resourcetype': case 'DAV::resourcetype':
add_failure('rm', $tag, 'HTTP/1.1 409 Conflict', add_failure('rm', $tag, 'HTTP/1.1 403 Forbidden',
translate("DAV::resourcetype may only be set to a new value, it may not be removed."), 'cannot-modify-protected-property'); translate("DAV::resourcetype may only be set to a new value, it may not be removed."), 'cannot-modify-protected-property');
break; break;
@ -242,7 +242,7 @@ foreach( $rmprops AS $k => $setting ) {
$qry->QDo('UPDATE collection SET timezone = NULL WHERE dav_name = :dav_name', array( ':dav_name' => $dav_resource->dav_name()) ); $qry->QDo('UPDATE collection SET timezone = NULL WHERE dav_name = :dav_name', array( ':dav_name' => $dav_resource->dav_name()) );
} }
else { else {
add_failure('rm', $tag, 'HTTP/1.1 409 Conflict', add_failure('rm', $tag, 'HTTP/1.1 403 Forbidden',
translate("calendar-timezone property is only valid for a calendar."), 'cannot-modify-protected-property'); translate("calendar-timezone property is only valid for a calendar."), 'cannot-modify-protected-property');
} }
break; break;