diff --git a/testing/tests/binding/1000-BIND.result b/testing/tests/binding/1000-BIND.result index 46f6fc49..2a8b3f71 100644 --- a/testing/tests/binding/1000-BIND.result +++ b/testing/tests/binding/1000-BIND.result @@ -7,7 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1602< + bind_id: >1603< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/user2/< diff --git a/testing/tests/binding/1001-BIND.result b/testing/tests/binding/1001-BIND.result index 273d488a..804f6656 100644 --- a/testing/tests/binding/1001-BIND.result +++ b/testing/tests/binding/1001-BIND.result @@ -9,7 +9,7 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. - bind_id: >1602< + bind_id: >1603< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/user2/< diff --git a/testing/tests/binding/1012-BIND.result b/testing/tests/binding/1012-BIND.result index ee90f9c8..d9918648 100644 --- a/testing/tests/binding/1012-BIND.result +++ b/testing/tests/binding/1012-BIND.result @@ -7,14 +7,14 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1602< + bind_id: >1603< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< parent_container: >/user4/< ticket_id_length: >8< - bind_id: >1603< + bind_id: >1604< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< diff --git a/testing/tests/binding/1022-BIND.result b/testing/tests/binding/1022-BIND.result index bca2fb62..6b5e317c 100644 --- a/testing/tests/binding/1022-BIND.result +++ b/testing/tests/binding/1022-BIND.result @@ -7,21 +7,21 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1602< + bind_id: >1603< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1603< + bind_id: >1604< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1607< + bind_id: >1608< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< diff --git a/testing/tests/binding/1023-BIND.result b/testing/tests/binding/1023-BIND.result index a9947270..4ffd90db 100644 --- a/testing/tests/binding/1023-BIND.result +++ b/testing/tests/binding/1023-BIND.result @@ -7,28 +7,28 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1602< + bind_id: >1603< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1603< + bind_id: >1604< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1607< + bind_id: >1608< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1608< + bind_id: >1609< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< diff --git a/testing/tests/binding/1024-BIND.result b/testing/tests/binding/1024-BIND.result index 3486cf76..fa8d0115 100644 --- a/testing/tests/binding/1024-BIND.result +++ b/testing/tests/binding/1024-BIND.result @@ -9,28 +9,28 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. - bind_id: >1602< + bind_id: >1603< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1603< + bind_id: >1604< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1607< + bind_id: >1608< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1608< + bind_id: >1609< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< diff --git a/testing/tests/binding/1025-PROPFIND.result b/testing/tests/binding/1025-PROPFIND.result index 494c6369..6a0a3406 100644 --- a/testing/tests/binding/1025-PROPFIND.result +++ b/testing/tests/binding/1025-PROPFIND.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1605 + /caldav.php/.resources/1606 @@ -89,7 +89,7 @@ A sub collection - /caldav.php/.resources/1606 + /caldav.php/.resources/1607 diff --git a/testing/tests/binding/1027-PROPFIND.result b/testing/tests/binding/1027-PROPFIND.result index 1d0e95d0..84dfa041 100644 --- a/testing/tests/binding/1027-PROPFIND.result +++ b/testing/tests/binding/1027-PROPFIND.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1605 + /caldav.php/.resources/1606 diff --git a/testing/tests/binding/1032-BIND-admin.result b/testing/tests/binding/1032-BIND-admin.result index 0f6c51ec..268e70a7 100644 --- a/testing/tests/binding/1032-BIND-admin.result +++ b/testing/tests/binding/1032-BIND-admin.result @@ -7,7 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1602< + bind_id: >1603< bind_owner: >1005< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< @@ -19,7 +19,7 @@ target_collection: >161< target_resource_i: >NULL< ticket_owner: >1003< - bind_id: >1603< + bind_id: >1604< bind_owner: >1005< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< @@ -31,7 +31,7 @@ target_collection: >160< target_resource_i: >NULL< ticket_owner: >1002< - bind_id: >1607< + bind_id: >1608< bind_owner: >1005< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< @@ -43,7 +43,7 @@ target_collection: >160< target_resource_i: >NULL< ticket_owner: >1002< - bind_id: >1608< + bind_id: >1609< bind_owner: >1005< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< @@ -55,7 +55,7 @@ target_collection: >161< target_resource_i: >NULL< ticket_owner: >1003< - bind_id: >1629< + bind_id: >1630< bind_owner: >1< bound_source_id: >162< dav_displayname: >user3 home< diff --git a/testing/tests/binding/1034-DELETE-admin-bind.result b/testing/tests/binding/1034-DELETE-admin-bind.result index 8920a837..05d864c5 100644 --- a/testing/tests/binding/1034-DELETE-admin-bind.result +++ b/testing/tests/binding/1034-DELETE-admin-bind.result @@ -4,14 +4,14 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy - bind_id: >1607< + bind_id: >1608< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< dav_owner_id: >1005< parent_container: >/user4/base/< - bind_id: >1608< + bind_id: >1609< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< diff --git a/testing/tests/binding/1038-PROPFIND-Depth-2.result b/testing/tests/binding/1038-PROPFIND-Depth-2.result index 245d8107..910a76ef 100644 --- a/testing/tests/binding/1038-PROPFIND-Depth-2.result +++ b/testing/tests/binding/1038-PROPFIND-Depth-2.result @@ -139,7 +139,7 @@ /caldav.php/user4/user1/ - "7e1c9a5e005cb3192ef305837033e271" + "467f80ffd189cc2ba7e98ea0dac71613" HTTP/1.1 200 OK @@ -6442,7 +6442,7 @@ /caldav.php/user4/base/user1/ - "7e1c9a5e005cb3192ef305837033e271" + "467f80ffd189cc2ba7e98ea0dac71613" HTTP/1.1 200 OK diff --git a/testing/tests/binding/1100-BIND.result b/testing/tests/binding/1100-BIND.result index 6c451385..f054db91 100644 --- a/testing/tests/binding/1100-BIND.result +++ b/testing/tests/binding/1100-BIND.result @@ -7,36 +7,36 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1602< + bind_id: >1603< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1603< + bind_id: >1604< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1607< + bind_id: >1608< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1608< + bind_id: >1609< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< length: >8< parent_container: >/user4/base/< - bind_id: >1630< - bound_source_id: >1605< + bind_id: >1631< + bound_source_id: >1606< dav_displayname: >A normal collection< dav_name: >/user4/boundbase/< length: >NULL< diff --git a/testing/tests/binding/1101-PROPFIND-normal.result b/testing/tests/binding/1101-PROPFIND-normal.result index 0603bc99..47ac0567 100644 --- a/testing/tests/binding/1101-PROPFIND-normal.result +++ b/testing/tests/binding/1101-PROPFIND-normal.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1605 + /caldav.php/.resources/1606 @@ -89,7 +89,7 @@ A sub collection - /caldav.php/.resources/1606 + /caldav.php/.resources/1607 @@ -111,7 +111,7 @@ newcalendar - /caldav.php/.resources/1619 + /caldav.php/.resources/1620 diff --git a/testing/tests/binding/1102-PROPFIND-bound.result b/testing/tests/binding/1102-PROPFIND-bound.result index 584b004e..e0abf0a1 100644 --- a/testing/tests/binding/1102-PROPFIND-bound.result +++ b/testing/tests/binding/1102-PROPFIND-bound.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1605 + /caldav.php/.resources/1606 @@ -98,7 +98,7 @@ A sub collection - /caldav.php/.resources/1606 + /caldav.php/.resources/1607 @@ -124,7 +124,7 @@ newcalendar - /caldav.php/.resources/1619 + /caldav.php/.resources/1620 diff --git a/testing/tests/binding/1106-BIND.result b/testing/tests/binding/1106-BIND.result index b0d4279e..f7618475 100644 --- a/testing/tests/binding/1106-BIND.result +++ b/testing/tests/binding/1106-BIND.result @@ -7,43 +7,43 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1602< + bind_id: >1603< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1603< + bind_id: >1604< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1607< + bind_id: >1608< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1608< + bind_id: >1609< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< length: >8< parent_container: >/user4/base/< - bind_id: >1630< - bound_source_id: >1605< + bind_id: >1631< + bound_source_id: >1606< dav_displayname: >A normal collection< dav_name: >/user4/boundbase/< length: >NULL< parent_container: >/user4/< - bind_id: >1631< - bound_source_id: >1605< + bind_id: >1632< + bound_source_id: >1606< dav_displayname: >A normal collection< dav_name: >/user4/boundbase2/< length: >NULL< diff --git a/testing/tests/binding/1200-BIND-to-BIND.result b/testing/tests/binding/1200-BIND-to-BIND.result index 4b33e50d..1aea12b8 100644 --- a/testing/tests/binding/1200-BIND-to-BIND.result +++ b/testing/tests/binding/1200-BIND-to-BIND.result @@ -7,50 +7,50 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1602< + bind_id: >1603< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1603< + bind_id: >1604< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1607< + bind_id: >1608< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1608< + bind_id: >1609< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< length: >8< parent_container: >/user4/base/< - bind_id: >1630< - bound_source_id: >1605< + bind_id: >1631< + bound_source_id: >1606< dav_displayname: >A normal collection< dav_name: >/user4/boundbase/< length: >NULL< parent_container: >/user4/< - bind_id: >1631< - bound_source_id: >1605< + bind_id: >1632< + bound_source_id: >1606< dav_displayname: >A normal collection< dav_name: >/user4/boundbase2/< length: >NULL< parent_container: >/user4/< - bind_id: >1632< - bound_source_id: >1605< + bind_id: >1633< + bound_source_id: >1606< dav_displayname: >A normal collection< dav_name: >/user4/bind2bind/< length: >NULL< diff --git a/testing/tests/binding/1201-BIND-to-BIND.result b/testing/tests/binding/1201-BIND-to-BIND.result index ac9c87ef..826dddce 100644 --- a/testing/tests/binding/1201-BIND-to-BIND.result +++ b/testing/tests/binding/1201-BIND-to-BIND.result @@ -7,57 +7,57 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1602< + bind_id: >1603< bound_source_id: >161< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1603< + bind_id: >1604< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1607< + bind_id: >1608< bound_source_id: >160< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1608< + bind_id: >1609< bound_source_id: >161< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< length: >8< parent_container: >/user4/base/< - bind_id: >1630< - bound_source_id: >1605< + bind_id: >1631< + bound_source_id: >1606< dav_displayname: >A normal collection< dav_name: >/user4/boundbase/< length: >NULL< parent_container: >/user4/< - bind_id: >1631< - bound_source_id: >1605< + bind_id: >1632< + bound_source_id: >1606< dav_displayname: >A normal collection< dav_name: >/user4/boundbase2/< length: >NULL< parent_container: >/user4/< - bind_id: >1632< - bound_source_id: >1605< + bind_id: >1633< + bound_source_id: >1606< dav_displayname: >A normal collection< dav_name: >/user4/bind2bind/< length: >NULL< parent_container: >/user4/< - bind_id: >1633< - bound_source_id: >1605< + bind_id: >1634< + bound_source_id: >1606< dav_displayname: >A normal collection< dav_name: >/user4/bind2bind-noslash/< length: >NULL< diff --git a/testing/tests/binding/Restore-Database.result b/testing/tests/binding/Restore-Database.result index 39b29eaf..0592a69c 100644 --- a/testing/tests/binding/Restore-Database.result +++ b/testing/tests/binding/Restore-Database.result @@ -5,7 +5,7 @@ setval -------- - 1601 + 1602 (1 row) setval diff --git a/testing/tests/carddav/Restore-Database.result b/testing/tests/carddav/Restore-Database.result index ea9b3017..babc8629 100644 --- a/testing/tests/carddav/Restore-Database.result +++ b/testing/tests/carddav/Restore-Database.result @@ -5,7 +5,7 @@ setval -------- - 1633 + 1634 (1 row) setval diff --git a/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.result b/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.result new file mode 100644 index 00000000..ce0c451c --- /dev/null +++ b/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.result @@ -0,0 +1,6 @@ +HTTP/1.1 204 No Content +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy + + diff --git a/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.test b/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.test new file mode 100644 index 00000000..c19182f4 --- /dev/null +++ b/testing/tests/regression-suite/2202-RFC5545-Duration-CleanUp.test @@ -0,0 +1,14 @@ +# +# Test the DELETE of the collection which Chandler does at +# this point in it's search for understanding +# +TYPE=DELETE +URL=http://regression.host/caldav.php/user1/home/zero-duration-event.ics +HEAD + +QUERY +SELECT dav_id, dav_name, dav_etag + FROM caldav_data + WHERE dav_name = '/user1/home/zero-duration-event.ics' +ENDQUERY + diff --git a/testing/tests/scheduling/Restore-Database.result b/testing/tests/scheduling/Restore-Database.result index 0e126f5f..3f09cf78 100644 --- a/testing/tests/scheduling/Restore-Database.result +++ b/testing/tests/scheduling/Restore-Database.result @@ -5,7 +5,7 @@ setval -------- - 1653 + 1654 (1 row) setval diff --git a/testing/tests/timezone/Restore-Database.result b/testing/tests/timezone/Restore-Database.result index 85feeb12..c3dcdc7b 100644 --- a/testing/tests/timezone/Restore-Database.result +++ b/testing/tests/timezone/Restore-Database.result @@ -5,7 +5,7 @@ setval -------- - 1678 + 1679 (1 row) setval @@ -125,7 +125,7 @@ setval -------- - 48 + 49 (1 row) setval