Results change due to moving the DAV: header and PROPFIND changes

2026-05-30 03:24:47 +00:00 · 2007-10-30 10:15:06 +13:00 · 2007-10-30 10:15:06 +13:00 · 85707c9eba
commit 85707c9eba
parent 48dc44eba7
97 changed files with 232 additions and 86 deletions
--- a/testing/tests/regression-suite/001-Mulberry-1.result
+++ b/testing/tests/regression-suite/001-Mulberry-1.result
@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/002-Mulberry-1.result
+++ b/testing/tests/regression-suite/002-Mulberry-1.result
@ -1,11 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "373430133d9c51260783bc61177aa1d3"
-Content-Length: 1880
+DAV: 1, 2, access-control, calendar-access
+ETag: "e4c5d91096060db78286e699730987a1"
+Content-Length: 1920
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/</href>
  <propstat>
--- a/testing/tests/regression-suite/003-Mulberry-1.result
+++ b/testing/tests/regression-suite/003-Mulberry-1.result
@ -1,11 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "cc0f368288b5b8373d00e28f842190e6"
-Content-Length: 383
+DAV: 1, 2, access-control, calendar-access
+ETag: "792db2309cf4d54e7c00bbe79633895f"
+Content-Length: 423
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/</href>
  <propstat>
--- a/testing/tests/regression-suite/004-Mulberry-1.result
+++ b/testing/tests/regression-suite/004-Mulberry-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/005-Mulberry-1.result
+++ b/testing/tests/regression-suite/005-Mulberry-1.result
@ -1,11 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "4bbc059be0ae780aa041d72b2ee837a6"
-Content-Length: 726
+DAV: 1, 2, access-control, calendar-access
+ETag: "a30e9b8f2662cd1da17252d3b814ef04"
+Content-Length: 730
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/</href>
  <propstat>
@ -28,7 +29,7 @@ Content-Type: text/xml; charset="utf-8"
    <getcontentlength/>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
   </prop>
   <status>HTTP/1.1 200 OK</status>
--- a/testing/tests/regression-suite/006-Mulberry-1.result
+++ b/testing/tests/regression-suite/006-Mulberry-1.result
@ -1,11 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "63c4632cd1f99190e4613ed7912bc44a"
-Content-Length: 483
+DAV: 1, 2, access-control, calendar-access
+ETag: "7364b32495feb0c9bbe89cdb10988762"
+Content-Length: 487
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
@ -14,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
    <getcontentlength/>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
   </prop>
--- a/testing/tests/regression-suite/007-Mulberry-1.result
+++ b/testing/tests/regression-suite/007-Mulberry-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 405 Method Not Allowed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 45
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/010-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/010-Mulberry-PUT-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "b000d7defa19ccb7cd21e546b54155ee"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
+++ b/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
@ -1,5 +1,6 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "b000d7defa19ccb7cd21e546b54155ee"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/012-Mulberry-PUT-2.result
+++ b/testing/tests/regression-suite/012-Mulberry-PUT-2.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "22158fc45876987b2b00749a3a1684d8"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
+++ b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
@ -1,11 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "3f528a647491c5f1bd3e5ac60dc7d471"
-Content-Length: 1051
+DAV: 1, 2, access-control, calendar-access
+ETag: "4cd4df7d08592927b92bcd697c2cdde7"
+Content-Length: 1055
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
@ -14,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
    <getcontentlength>1425</getcontentlength>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
   </prop>
   <status>HTTP/1.1 200 OK</status>
--- a/testing/tests/regression-suite/014-Mulberry-PUT-3.result
+++ b/testing/tests/regression-suite/014-Mulberry-PUT-3.result
@ -1,5 +1,6 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "2c32a2f8aba853654eb17fe037a4db4d"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
+++ b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
@ -1,11 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "c195de52b2e0c2e02fb1da08051bde14"
-Content-Length: 1051
+DAV: 1, 2, access-control, calendar-access
+ETag: "d880baf3102a9de9bcea4d5f71a6b500"
+Content-Length: 1055
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
@ -14,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
    <getcontentlength>1467</getcontentlength>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
   </prop>
   <status>HTTP/1.1 200 OK</status>
--- a/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result
+++ b/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
+++ b/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
@ -1,5 +1,6 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 36
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/018-Mulberry-PUT-4.result
+++ b/testing/tests/regression-suite/018-Mulberry-PUT-4.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "75a75e1c7c4546074aab7645b5323738"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
+++ b/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
@ -1,5 +1,6 @@
 HTTP/1.1 400 Bad Request
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 46
 Connection: close
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/020-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/020-Mulberry-DELETE-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 412 Precondition Failed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 44
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/021-Mulberry-DELETE-2.result
+++ b/testing/tests/regression-suite/021-Mulberry-DELETE-2.result
@ -1,5 +1,6 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/022-Mulberry-PUT-5.result
+++ b/testing/tests/regression-suite/022-Mulberry-PUT-5.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "81979ab45975368d619171a4c3e1e5e2"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/023-Mulberry-DELETE-3.result
+++ b/testing/tests/regression-suite/023-Mulberry-DELETE-3.result
@ -1,5 +1,6 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
+++ b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/102-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/102-Evo-REPORT-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "7dd087918d1ab4ba7e7861307b57c6dd"
 Content-Length: 341
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/103-Evo-GET-1.result
+++ b/testing/tests/regression-suite/103-Evo-GET-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Etag: "2c32a2f8aba853654eb17fe037a4db4d"
 Content-Length: 747
 Content-Type: text/calendar
--- a/testing/tests/regression-suite/104-Evo-PUT-1.result
+++ b/testing/tests/regression-suite/104-Evo-PUT-1.result
@ -2,6 +2,7 @@ HTTP/1.1 100 Continue

 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "c3658901fd4689d4a1e1d6f08601ef4f"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/105-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/105-Evo-REPORT-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "4b08329b0bd43cb3a95a0e4f8286c423"
 Content-Length: 582
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/106-Evo-GET-1.result
+++ b/testing/tests/regression-suite/106-Evo-GET-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Etag: "c3658901fd4689d4a1e1d6f08601ef4f"
 Content-Length: 1059
 Content-Type: text/calendar
--- a/testing/tests/regression-suite/107-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/107-Evo-REPORT-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "709206be6ed57942c30d98aa629efc6f"
 Content-Length: 560
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/108-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/108-Evo-REPORT-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "5a05dff964308972a179d2e7f44bf751"
 Content-Length: 596
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
+++ b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/203-Moz-REPORT-2.result
+++ b/testing/tests/regression-suite/203-Moz-REPORT-2.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "a57a6c930b230c67301c4295254a3521"
 Content-Length: 2420
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/204-Moz-REPORT-3.result
+++ b/testing/tests/regression-suite/204-Moz-REPORT-3.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "46061ea7ac75102dbb315b82c666c24d"
 Content-Length: 1110
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
+++ b/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
@ -1,18 +1,19 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "69c451806ff9146e8c1f3113e1aa01a3"
-Content-Length: 343
+DAV: 1, 2, access-control, calendar-access
+ETag: "334c8abc0ac73261cdbf963fc7269d76"
+Content-Length: 347
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
   <prop>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
   </prop>
   <status>HTTP/1.1 200 OK</status>
--- a/testing/tests/regression-suite/206-Moz-PUT-1.result
+++ b/testing/tests/regression-suite/206-Moz-PUT-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "a1c6404d61190f9574e2bfd69383f144"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/207-Moz-REPORT-4.result
+++ b/testing/tests/regression-suite/207-Moz-REPORT-4.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "5ea083d59cfcd77e3baf11ef74297e6e"
 Content-Length: 1358
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/208-Moz-REPORT-5.result
+++ b/testing/tests/regression-suite/208-Moz-REPORT-5.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "07474790757c5e1b526ce4901889d6d3"
 Content-Length: 68
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/209-Moz-PUT-CONFIDENTIAL.result
+++ b/testing/tests/regression-suite/209-Moz-PUT-CONFIDENTIAL.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "08a435c2abaf38f4a50a997343c098a7"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.result
+++ b/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "5def8ae2b20893a1c7f4dbaeb008f2f1"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/211-Moz-PUT-TENTATIVE.result
+++ b/testing/tests/regression-suite/211-Moz-PUT-TENTATIVE.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "ac90acd649c25070b1a2a17fb31a105a"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/212-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/212-Moz-PROPFIND.result
@ -1,19 +1,20 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Location: /user1/home/
-ETag: "69c451806ff9146e8c1f3113e1aa01a3"
-Content-Length: 343
+ETag: "334c8abc0ac73261cdbf963fc7269d76"
+Content-Length: 347
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
   <prop>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
   </prop>
   <status>HTTP/1.1 200 OK</status>
--- a/testing/tests/regression-suite/213-Moz-MKCALENDAR.result
+++ b/testing/tests/regression-suite/213-Moz-MKCALENDAR.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/214-Moz-PUT-New-Task.result
+++ b/testing/tests/regression-suite/214-Moz-PUT-New-Task.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "509b0f0d8a3363379f9f5727f5dd74a0"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/215-Moz-PUT-InProgress-Task.result
+++ b/testing/tests/regression-suite/215-Moz-PUT-InProgress-Task.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "cb3d9dc3e8c157f53eba3ea0e1e0f146"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/216-Moz-PUT-Completed-Task.result
+++ b/testing/tests/regression-suite/216-Moz-PUT-Completed-Task.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "00ad5eb1eb5507884710b0b66aa5d5c4"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/217-Moz-PUT-Cancelled-Task.result
+++ b/testing/tests/regression-suite/217-Moz-PUT-Cancelled-Task.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "a2990674708634a311bb98a59865ca50"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/230-Moz-REPORT-Tasks-Completed.result
+++ b/testing/tests/regression-suite/230-Moz-REPORT-Tasks-Completed.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "8f48e613721a5ccb5e44c277f7a1a909"
 Content-Length: 1630
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.result
+++ b/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "2d56ad662a3857cbba346a51e2287e22"
 Content-Length: 4276
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
+++ b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
+++ b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
@ -1,18 +1,19 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "1600fce3e77c55492cbdabff16d30d4f"
-Content-Length: 437
+DAV: 1, 2, access-control, calendar-access
+ETag: "de5751155d5d8961c7fc9d38a690dd49"
+Content-Length: 441
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
   <prop>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
    <displayname>home</displayname>
    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
--- a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
+++ b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
@ -1,18 +1,19 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "2c2763425add12e59c8c0b581747f249"
-Content-Length: 552
+DAV: 1, 2, access-control, calendar-access
+ETag: "5c2a97317978ca314ada6490cbebcc81"
+Content-Length: 556
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
   <prop>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
    <displayname>home</displayname>
    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
--- a/testing/tests/regression-suite/305-Chandler-MKCOL-1.result
+++ b/testing/tests/regression-suite/305-Chandler-MKCOL-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/306-Chandler-DELETE-1.result
+++ b/testing/tests/regression-suite/306-Chandler-DELETE-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/308-Chandler-OPTIONS-3.result
+++ b/testing/tests/regression-suite/308-Chandler-OPTIONS-3.result
@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-3.result
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-3.result
@ -1,18 +1,19 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "f81b76c70be67ab1e4f0e3c1eb7fd5f5"
-Content-Length: 465
+DAV: 1, 2, access-control, calendar-access
+ETag: "2d33f4ae017a778547da61069d95e18f"
+Content-Length: 469
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/.chandler/</href>
  <propstat>
   <prop>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
    <displayname>/user1/home/.chandler/</displayname>
    <getetag>"a150b8e5ab38926a153b90c6546dc610"</getetag>
--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
@ -1,18 +1,19 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "a0d964965269357ef26c8c4ab7f7ad29"
-Content-Length: 3605
+DAV: 1, 2, access-control, calendar-access
+ETag: "f678e2f00e4582d963162b293e1e8ecb"
+Content-Length: 3609
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
   <prop>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
    <displayname>home</displayname>
    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
--- a/testing/tests/regression-suite/310-Chandler-PUT-1.result
+++ b/testing/tests/regression-suite/310-Chandler-PUT-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "0d7a68984bf525342d22b8924a57e8e2"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/311-Chandler-PUT-2.result
+++ b/testing/tests/regression-suite/311-Chandler-PUT-2.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "421abf7e4848d2fecbf64217ed205d4b"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
+++ b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
+++ b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
@ -8,10 +8,18 @@
    <getcontentlength>9531</getcontentlength>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
   </prop>
   <status>HTTP/1.1 200 OK</status>
  </propstat>
+  <propstat>
+   <prop>
+    <executable xmlns="http://apache.org/dav/props/"/>
+    <checked-in xmlns="dav:"/>
+    <checked-out xmlns="dav:"/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
 </response>
 </multistatus>
--- a/testing/tests/regression-suite/510-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/510-iCal-PROPFIND.result
@ -1,18 +1,39 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
+ETag: "d48322f182f679c3bdcf47af918de025"
+Content-Length: 1022
+Content-Type: text/xml; charset="utf-8"
+
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
   <prop>
-    <calendar-home-set xmlns="urn:ietf:params:xml:ns:caldav">http://mycaldav/caldav.php/user1/home/</calendar-home-set>
+    <C:calendar-home-set>
+     <href>http://mycaldav/caldav.php/user1/</href>
+    </C:calendar-home-set>
+    <C:schedule-inbox-url>
+     <href>http://mycaldav/caldav.php/user1/.inbox/</href>
+    </C:schedule-inbox-url>
+    <C:schedule-outbox-url>
+     <href>http://mycaldav/caldav.php/user1/.outbox/</href>
+    </C:schedule-outbox-url>
+    <C:calendar-user-address-set>
+     <href>http://mycaldav/caldav.php/user1/</href>
+     <href>mailto:user1@example.net</href>
+    </C:calendar-user-address-set>
    <displayname>home</displayname>
-    <URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-USER-ADDRESS-SET/>
-    <URN:IETF:PARAMS:XML:NS:CALDAV:SCHEDULE-INBOX-URL/>
-    <URN:IETF:PARAMS:XML:NS:CALDAV:SCHEDULE-OUTBOX-URL/>
-    <HTTP://CALENDARSERVER.ORG/NS/:DROPBOX-HOME-URL/>
-    <HTTP://CALENDARSERVER.ORG/NS/:NOTIFICATIONS-URL/>
   </prop>
   <status>HTTP/1.1 200 OK</status>
  </propstat>
+  <propstat>
+   <prop>
+    <dropbox-home-url xmlns="http://calendarserver.org/ns/"/>
+    <notifications-url xmlns="http://calendarserver.org/ns/"/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
 </response>
 </multistatus>
--- a/testing/tests/regression-suite/800-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/800-Spec-LOCK-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Lock-Token: <opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx>
 Content-Length: 473
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/801-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/801-Spec-LOCK-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 473
 Content-Type: text/xml; charset="utf-8"

--- a/testing/tests/regression-suite/802-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/802-Spec-LOCK-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 198
 Content-Type: text/xml; charset="utf-8"

--- a/testing/tests/regression-suite/803-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/803-Mulberry-PUT-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 198
 Content-Type: text/xml; charset="utf-8"

--- a/testing/tests/regression-suite/804-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/804-Mulberry-PUT-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "b000d7defa19ccb7cd21e546b54155ee"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
--- a/testing/tests/regression-suite/805-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/805-Mulberry-DELETE-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 198
 Content-Type: text/xml; charset="utf-8"

--- a/testing/tests/regression-suite/806-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/806-Mulberry-DELETE-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/808-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/808-Spec-UNLOCK-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 198
 Content-Type: text/xml; charset="utf-8"

--- a/testing/tests/regression-suite/809-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/809-Spec-UNLOCK-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/810-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/810-Spec-LOCK-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Lock-Token: <opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx>
 Content-Length: 473
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/811-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/811-Spec-LOCK-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 473
 Content-Type: text/xml; charset="utf-8"

--- a/testing/tests/regression-suite/812-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/812-Spec-LOCK-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 183
 Content-Type: text/xml; charset="utf-8"

--- a/testing/tests/regression-suite/815-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/815-Spec-UNLOCK-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 183
 Content-Type: text/xml; charset="utf-8"

--- a/testing/tests/regression-suite/816-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/816-Spec-UNLOCK-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
+++ b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
@ -10,7 +10,7 @@
    <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
    <displayname>home</displayname>
    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
@ -37,5 +37,14 @@
   </prop>
   <status>HTTP/1.1 200 OK</status>
  </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery xmlns="dav:"/>
+    <source xmlns="dav:"/>
+    <checked-in xmlns="dav:"/>
+    <checked-out xmlns="dav:"/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
 </response>
 </multistatus>
--- a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
+++ b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
@ -1,11 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "deadbeefcafefeeddeadbeefcafefeed"
-Content-Length: 969
+Content-Length: 1204
 Content-Type: text/xml; charset="utf-8"

 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
@ -16,12 +17,10 @@ Content-Type: text/xml; charset="utf-8"
    <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
    <displayname>home</displayname>
    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
-    <DAV::BOGUS-PROPERTY/>
-    <DAV::CONTENTBOGOSITY/>
    <getcontentlanguage>en_NZ.UTF-8</getcontentlanguage>
    <supportedlock>
     <lockentry>
@ -36,5 +35,16 @@ Content-Type: text/xml; charset="utf-8"
   </prop>
   <status>HTTP/1.1 200 OK</status>
  </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery xmlns="dav:"/>
+    <source xmlns="dav:"/>
+    <checked-in xmlns="dav:"/>
+    <checked-out xmlns="dav:"/>
+    <bogus-property xmlns="dav:"/>
+    <contentbogosity xmlns="dav:"/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
 </response>
 </multistatus>
--- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
+++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
@ -10,7 +10,7 @@
    <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
    <displayname>home</displayname>
    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
@ -28,6 +28,15 @@
   </prop>
   <status>HTTP/1.1 200 OK</status>
  </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery xmlns="dav:"/>
+    <source xmlns="dav:"/>
+    <checked-in xmlns="dav:"/>
+    <checked-out xmlns="dav:"/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
 </response>
 <response>
  <href>/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
--- a/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
+++ b/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
  <propstat>
--- a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
+++ b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
   <prop>
-    <supported-collation-set xmlns="urn:ietf:params:xml:ns:caldav">
-     <supported-collation>i;ascii-casemap</supported-collation>
-     <supported-collation>i;octet</supported-collation>
-    </supported-collation-set>
-    <supported-calendar-component-set xmlns="urn:ietf:params:xml:ns:caldav">
-     <comp name="VEVENT"/>
-     <comp name="VTODO"/>
-    </supported-calendar-component-set>
+    <C:supported-collation-set>
+     <C:supported-collation>i;ascii-casemap</C:supported-collation>
+     <C:supported-collation>i;octet</C:supported-collation>
+    </C:supported-collation-set>
+    <C:supported-calendar-component-set>
+     <C:comp name="VEVENT"/>
+     <C:comp name="VTODO"/>
+    </C:supported-calendar-component-set>
    <getcontenttype>httpd/unix-directory</getcontenttype>
    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
    <getcontentlength>9531</getcontentlength>
    <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
    <resourcetype>
     <collection/>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+     <C:calendar/>
    </resourcetype>
    <displayname>home</displayname>
    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
--- a/testing/tests/regression-suite/825-Spec-PROPFIND-6.result
+++ b/testing/tests/regression-suite/825-Spec-PROPFIND-6.result
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
  <propstat>
--- a/testing/tests/regression-suite/830-Spec-FREEBUSY-1.result
+++ b/testing/tests/regression-suite/830-Spec-FREEBUSY-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 928
 Content-Type: text/calendar

--- a/testing/tests/regression-suite/831-Spec-RRULE-1.result
+++ b/testing/tests/regression-suite/831-Spec-RRULE-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 5020
 Content-Type: text/plain

--- a/testing/tests/regression-suite/834-Spec-FREEBUSY-1.result
+++ b/testing/tests/regression-suite/834-Spec-FREEBUSY-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 1957
 Content-Type: text/calendar

--- a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result
+++ b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 239
 Content-Type: text/xml; charset="utf-8"

--- a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result
+++ b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result
@ -1,5 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 239
 Content-Type: text/xml; charset="utf-8"

--- a/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result
+++ b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 464
 Content-Type: text/xml; charset="utf-8"

--- a/testing/tests/regression-suite/843-Spec-PROPFIND.result
+++ b/testing/tests/regression-suite/843-Spec-PROPFIND.result
@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <response>
  <href>/caldav.php/user1/home/</href>
  <propstat>
   <prop>
    <displayname>User One's Calendar</displayname>
-    <DAV::OWNER/>
    <URN:MCMILLAN:BOGUS:XML:NS:RSCDS:ARBITRARY>A completely bogus property which should be saved.</URN:MCMILLAN:BOGUS:XML:NS:RSCDS:ARBITRARY>
   </prop>
   <status>HTTP/1.1 200 OK</status>
  </propstat>
+  <propstat>
+   <prop>
+    <owner xmlns="dav:"/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
 </response>
 </multistatus>
--- a/testing/tests/regression-suite/850-Spec-REPORT-1.result
+++ b/testing/tests/regression-suite/850-Spec-REPORT-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "3140e532d35ae4918005eb9bf5fcc26b"
 Content-Length: 1456
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/851-Spec-REPORT-1.result
+++ b/testing/tests/regression-suite/851-Spec-REPORT-1.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "8bb1ae7c599f81130860154adb77364b"
 Content-Length: 5175
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/860-Spec-REPORT-principal.result
+++ b/testing/tests/regression-suite/860-Spec-REPORT-principal.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "c345629a9689adce5411818c3c29aa43"
 Content-Length: 358
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/861-Spec-REPORT-principal.result
+++ b/testing/tests/regression-suite/861-Spec-REPORT-principal.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "8ee6bd9a1b7e15f40e6e24f149c6bf20"
 Content-Length: 3720
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/862-Spec-REPORT-principal.result
+++ b/testing/tests/regression-suite/862-Spec-REPORT-principal.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "d8fe1f4720e6249cb2fb0711fbed9794"
 Content-Length: 688
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/863-Spec-REPORT-principal.result
+++ b/testing/tests/regression-suite/863-Spec-REPORT-principal.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "f9a0b07b2c7b0347a9ae26a412baef6b"
 Content-Length: 743
 Content-Type: text/xml; charset="utf-8"
--- a/testing/tests/regression-suite/900-Moz-REPORT.result
+++ b/testing/tests/regression-suite/900-Moz-REPORT.result
@ -1,5 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 ETag: "d19579c20ab7e6349b50af9e16ef5abd"
 Content-Length: 6643
 Keep-Alive: timeout=15, max=100
--- a/testing/tests/regression-suite/901-GET-Collection.result
+++ b/testing/tests/regression-suite/901-GET-Collection.result
@ -1,11 +1,13 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 5750
+DAV: 1, 2, access-control, calendar-access
+Content-Length: 5784
 Content-Type: text/calendar

 BEGIN:VCALENDAR
 PRODID:-//Catalyst.Net.NZ//NONSGML AWL Calendar//EN
 VERSION:2.0
+X-WR-CALNAME:User One's Calendar
 BEGIN:VTODO
 CREATED:20070805T201647Z
 LAST-MODIFIED:20070805T201834Z
--- a/testing/tests/regression-suite/902-PUT-collection.result
+++ b/testing/tests/regression-suite/902-PUT-collection.result
@ -2,6 +2,7 @@ HTTP/1.1 100 Continue

 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"

--- a/testing/tests/regression-suite/903-GET-Collection.result
+++ b/testing/tests/regression-suite/903-GET-Collection.result
@ -1,11 +1,13 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 23628
+DAV: 1, 2, access-control, calendar-access
+Content-Length: 23650
 Content-Type: text/calendar

 BEGIN:VCALENDAR
 PRODID:-//Catalyst.Net.NZ//NONSGML AWL Calendar//EN
 VERSION:2.0
+X-WR-CALNAME:entire/
 BEGIN:VEVENT
 UID:20061119T201927Z-5105-1000-5103-8@ubu
 DTSTAMP:20061119T201927Z