From f06a01c14d96ab500f9fb0bcad79b4b20fce56a3 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Sun, 14 Jun 2009 21:24:46 +1200
Subject: [PATCH] Updated results with corrected caldav proxy handling.

---
 .../regression-suite/003-Mulberry-1.result    | 38 +++----
 .../regression-suite/005-Mulberry-1.result    | 70 ++++++-------
 .../regression-suite/006-Mulberry-1.result    | 38 +------
 .../013-Mulberry-PROPFIND-5.result            | 36 +------
 .../015-Mulberry-PROPFIND-6.result            | 36 +------
 .../205-Moz-PROPFIND-1.result                 | 32 +-----
 .../regression-suite/212-Moz-PROPFIND.result  | 32 +-----
 .../regression-suite/232-Moz-PROPFIND.result  | 32 +-----
 .../303-Chandler-PROPFIND-1.result            | 36 +------
 .../304-Chandler-PROPFIND-2.result            | 46 +--------
 .../309-Chandler-PROPFIND-4.result            | 36 +------
 .../401-Cadaver-PROPFIND-1.result             | 48 +--------
 .../regression-suite/502-iCal-PROPFIND.result | 86 ++++++++--------
 .../regression-suite/503-iCal-PROPFIND.result | 48 +--------
 .../regression-suite/504-iCal-PROPFIND.result | 34 +------
 .../regression-suite/522-iCal-PROPFIND.result | 52 +++++++++-
 .../regression-suite/602-Soho-PROPFIND.result | 46 ++++++++-
 .../regression-suite/603-Soho-PROPFIND.result | 48 ++++++++-
 .../820-Spec-PROPFIND-1.result                | 98 +------------------
 .../821-Spec-PROPFIND-2.result                | 86 +---------------
 .../822-Spec-PROPFIND-3.result                | 80 +--------------
 .../912-Space-PROPFIND.result                 | 52 +++++++++-
 22 files changed, 325 insertions(+), 785 deletions(-)

diff --git a/testing/tests/regression-suite/003-Mulberry-1.result b/testing/tests/regression-suite/003-Mulberry-1.result
index e1835f95..9791880f 100644
--- a/testing/tests/regression-suite/003-Mulberry-1.result
+++ b/testing/tests/regression-suite/003-Mulberry-1.result
@@ -1,12 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "d4cd9fc4f83d073d3f4202498cf2a3c8"
+ETag: "2ad651d00d49bd93e6b89aa3cf425073"
 Content-Length: 1505
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="http://calendarserver.org/ns/" xmlns:C1="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
  <response>
   <href>/caldav.php/user1/</href>
   <propstat>
@@ -21,6 +21,21 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <propstat>
+   <prop>
+    <getcontenttype>httpd/unix-directory</getcontenttype>
+    <getcontentlength/>
+    <resourcetype>
+     <collection/>
+     <C:calendar/>
+     <C:schedule-calendar/>
+    </resourcetype>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/calendar-proxy-read/</href>
   <propstat>
@@ -30,7 +45,7 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <principal/>
-     <C:calendar-proxy-read/>
+     <C1:calendar-proxy-read/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -45,22 +60,7 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <principal/>
-     <C:calendar-proxy-write/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <C1:calendar/>
-     <C1:schedule-calendar/>
+     <C1:calendar-proxy-write/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/005-Mulberry-1.result b/testing/tests/regression-suite/005-Mulberry-1.result
index 382aadbf..096079a1 100644
--- a/testing/tests/regression-suite/005-Mulberry-1.result
+++ b/testing/tests/regression-suite/005-Mulberry-1.result
@@ -1,12 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "a751343459b71280d20ed7f3921081f3"
-Content-Length: 1845
+ETag: "ea6f7e3236dc7831d1565787d84d55be"
+Content-Length: 1843
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="http://calendarserver.org/ns/" xmlns:C1="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
  <response>
   <href>/caldav.php/user1/</href>
   <propstat>
@@ -21,6 +21,36 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <propstat>
+   <prop>
+    <getcontenttype>httpd/unix-directory</getcontenttype>
+    <getcontentlength/>
+    <resourcetype>
+     <collection/>
+     <C:calendar/>
+     <C:schedule-calendar/>
+    </resourcetype>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/created/</href>
+  <propstat>
+   <prop>
+    <getcontenttype>httpd/unix-directory</getcontenttype>
+    <getcontentlength/>
+    <resourcetype>
+     <collection/>
+     <C:calendar/>
+     <C:schedule-calendar/>
+    </resourcetype>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/calendar-proxy-read/</href>
   <propstat>
@@ -30,7 +60,7 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <principal/>
-     <C:calendar-proxy-read/>
+     <C1:calendar-proxy-read/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -45,37 +75,7 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <principal/>
-     <C:calendar-proxy-write/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <C1:calendar/>
-     <C1:schedule-calendar/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/created/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <C1:calendar/>
-     <C1:schedule-calendar/>
+     <C1:calendar-proxy-write/>
     </resourcetype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/006-Mulberry-1.result b/testing/tests/regression-suite/006-Mulberry-1.result
index 87ee96e2..a4411ea0 100644
--- a/testing/tests/regression-suite/006-Mulberry-1.result
+++ b/testing/tests/regression-suite/006-Mulberry-1.result
@@ -1,12 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "07cd52776eef71c06ea32b44d5d6bab5"
-Content-Length: 1388
+ETag: "5f8ecaf86a38ff7709f798c29cb20590"
+Content-Length: 515
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -23,36 +23,4 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-    <getetag>"911baff687b9d8f2d08039da7735c799"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-    <getetag>"a8d209934d2040570b50ac23ad2f7553"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
index f5ee3181..89d82617 100644
--- a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
+++ b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
@@ -1,12 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "66bf6cf2a07b23f67590aa856d740698"
-Content-Length: 1840
+ETag: "d316148bfdf4f6d2cb5c4df178609e23"
+Content-Length: 1083
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -22,36 +22,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
   <propstat>
diff --git a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
index 87ca287d..d4ef2cf8 100644
--- a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
+++ b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
@@ -1,12 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "01bf5ac88abafae56a414e254d3f7b24"
-Content-Length: 1840
+ETag: "c9ccb2ceab9d94e563d624971bb5bdfe"
+Content-Length: 1083
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -22,36 +22,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
   <propstat>
diff --git a/testing/tests/regression-suite/205-Moz-PROPFIND-1.result b/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
index 42cbaf48..aa81c42a 100644
--- a/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
+++ b/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
@@ -1,12 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "bcdc7615abdf925100bbbb5b9e0d71ca"
-Content-Length: 968
+ETag: "af49e95c75e464601d516ba65f7dee49"
+Content-Length: 375
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -20,30 +20,4 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/212-Moz-PROPFIND.result b/testing/tests/regression-suite/212-Moz-PROPFIND.result
index 18a18bad..e6b4f14b 100644
--- a/testing/tests/regression-suite/212-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/212-Moz-PROPFIND.result
@@ -2,12 +2,12 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 Content-Location: /caldav.php/user1/home/
-ETag: "bcdc7615abdf925100bbbb5b9e0d71ca"
-Content-Length: 968
+ETag: "af49e95c75e464601d516ba65f7dee49"
+Content-Length: 375
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -21,30 +21,4 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/232-Moz-PROPFIND.result b/testing/tests/regression-suite/232-Moz-PROPFIND.result
index 42cbaf48..aa81c42a 100644
--- a/testing/tests/regression-suite/232-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/232-Moz-PROPFIND.result
@@ -1,12 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "bcdc7615abdf925100bbbb5b9e0d71ca"
-Content-Length: 968
+ETag: "af49e95c75e464601d516ba65f7dee49"
+Content-Length: 375
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -20,30 +20,4 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
index b530dc27..58bf41a0 100644
--- a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
+++ b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
@@ -1,12 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "c99b6cbbd20c0ef85bc09c3e05e1750d"
-Content-Length: 1313
+ETag: "6c77ce79527ae2380b02762fdad7284d"
+Content-Length: 475
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -22,34 +22,4 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-read/</displayname>
-    <getetag>"911baff687b9d8f2d08039da7735c799"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-write/</displayname>
-    <getetag>"a8d209934d2040570b50ac23ad2f7553"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
index b58bad41..362e14e9 100644
--- a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
+++ b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
@@ -1,12 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "10d21233ad7a68259e2bb765a5fed6ec"
-Content-Length: 1658
+ETag: "c0eb6835ba6844d697fce333ba20c9f5"
+Content-Length: 590
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -27,44 +27,4 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-read/</displayname>
-    <getetag>"911baff687b9d8f2d08039da7735c799"</getetag>
-    <current-user-privilege-set>
-     <privilege>
-      <all/>
-     </privilege>
-    </current-user-privilege-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-write/</displayname>
-    <getetag>"a8d209934d2040570b50ac23ad2f7553"</getetag>
-    <current-user-privilege-set>
-     <privilege>
-      <all/>
-     </privilege>
-    </current-user-privilege-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
index 9aa1bf29..d529eb59 100644
--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
@@ -1,12 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "c167b2998010b0423b83bd21411a08f8"
-Content-Length: 5105
+ETag: "2cf6e0a2957298dc61c5a90b650d4d01"
+Content-Length: 4267
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -22,36 +22,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-read/</displayname>
-    <getetag>"911baff687b9d8f2d08039da7735c799"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-write/</displayname>
-    <getetag>"a8d209934d2040570b50ac23ad2f7553"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
   <propstat>
diff --git a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
index f7174adc..24d4b20b 100644
--- 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:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:A="http://apache.org/dav/props/" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:A="http://apache.org/dav/props/">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -23,50 +23,4 @@
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-    <getlastmodified/>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <A:executable/>
-    <checked-in/>
-    <checked-out/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-    <getlastmodified/>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <A:executable/>
-    <checked-in/>
-    <checked-out/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/502-iCal-PROPFIND.result b/testing/tests/regression-suite/502-iCal-PROPFIND.result
index 0bfd6120..5e800c09 100644
--- a/testing/tests/regression-suite/502-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/502-iCal-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "fd95e0f242b0645dacf9f3e49b487fed"
+ETag: "749c1102d1fa2c3e72690999c1301e66"
 Content-Length: 3273
 Content-Type: text/xml; charset="utf-8"
 
@@ -27,48 +27,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-    <displayname>/user1/calendar-proxy-read/</displayname>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C:calendar-description/>
-    <A:calendar-color/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-    <displayname>/user1/calendar-proxy-write/</displayname>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C:calendar-description/>
-    <A:calendar-color/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -151,4 +109,46 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/calendar-proxy-read/</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <collection/>
+     <principal/>
+     <C1:calendar-proxy-read/>
+    </resourcetype>
+    <displayname>/user1/calendar-proxy-read/</displayname>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C:calendar-description/>
+    <A:calendar-color/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/calendar-proxy-write/</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <collection/>
+     <principal/>
+     <C1:calendar-proxy-write/>
+    </resourcetype>
+    <displayname>/user1/calendar-proxy-write/</displayname>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C:calendar-description/>
+    <A:calendar-color/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/503-iCal-PROPFIND.result b/testing/tests/regression-suite/503-iCal-PROPFIND.result
index c5ee892a..ed82ac37 100644
--- a/testing/tests/regression-suite/503-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/503-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "314b5483f18deed7377a9f38a81a8dcd"
-Content-Length: 1797
+ETag: "011216f39423de4124355f9206c17c9c"
+Content-Length: 702
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -29,48 +29,4 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <A:calendar-proxy-read/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-read/</displayname>
-    <A:getctag>"911baff687b9d8f2d08039da7735c799"</A:getctag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <A1:calendar-color/>
-    <C:calendar-description/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <A:calendar-proxy-write/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-write/</displayname>
-    <A:getctag>"a8d209934d2040570b50ac23ad2f7553"</A:getctag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <A1:calendar-color/>
-    <C:calendar-description/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/504-iCal-PROPFIND.result b/testing/tests/regression-suite/504-iCal-PROPFIND.result
index 33b98a8e..e6c77d94 100644
--- a/testing/tests/regression-suite/504-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/504-iCal-PROPFIND.result
@@ -1,12 +1,12 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "a2bb464313b983ab4ac862ebe41a49e9"
-Content-Length: 4844
+ETag: "545766d81a49a63df297e625f510cbe1"
+Content-Length: 4135
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -21,34 +21,6 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-    <getetag>"911baff687b9d8f2d08039da7735c799"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-    <getetag>"a8d209934d2040570b50ac23ad2f7553"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
   <propstat>
diff --git a/testing/tests/regression-suite/522-iCal-PROPFIND.result b/testing/tests/regression-suite/522-iCal-PROPFIND.result
index 5bebc1e8..dbd12dfd 100644
--- a/testing/tests/regression-suite/522-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/522-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "06eec932e579319d51217d5a8e8d3b8b"
-Content-Length: 2371
+ETag: "ead6125b6dea57939a8570868e2993db"
+Content-Length: 3560
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -102,4 +102,52 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user2/calendar-proxy-read/</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <collection/>
+     <principal/>
+     <A:calendar-proxy-read/>
+    </resourcetype>
+    <displayname>/user2/calendar-proxy-read/</displayname>
+    <A:getctag>"19a2e9eecca4a20bb93c23c0ab653d77"</A:getctag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C:calendar-free-busy-set/>
+    <C:calendar-description/>
+    <A1:calendar-color/>
+    <A1:calendar-order/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user2/calendar-proxy-write/</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <collection/>
+     <principal/>
+     <A:calendar-proxy-write/>
+    </resourcetype>
+    <displayname>/user2/calendar-proxy-write/</displayname>
+    <A:getctag>"f9ade6a8d81cbc6a7a7b932981955bb4"</A:getctag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C:calendar-free-busy-set/>
+    <C:calendar-description/>
+    <A1:calendar-color/>
+    <A1:calendar-order/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/602-Soho-PROPFIND.result b/testing/tests/regression-suite/602-Soho-PROPFIND.result
index 53a9e1cc..e905e10d 100644
--- a/testing/tests/regression-suite/602-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/602-Soho-PROPFIND.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "e2742009519720d7ed44b6b56b90aa1a"
+ETag: "b0c1ee66ec5504e1433bca881c1e0eaf"
 Transfer-Encoding: chunked
 Content-Type: text/xml; charset="utf-8"
 
@@ -513,4 +513,48 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/calendar-proxy-read/</href>
+  <propstat>
+   <prop>
+    <C:calendar-home-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-home-set>
+    <C:calendar-user-address-set>
+     <href>mailto:user1@example.net</href>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-user-address-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <A:dropbox-home-URL/>
+    <A:notifications-URL/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/calendar-proxy-write/</href>
+  <propstat>
+   <prop>
+    <C:calendar-home-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-home-set>
+    <C:calendar-user-address-set>
+     <href>mailto:user1@example.net</href>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-user-address-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <A:dropbox-home-URL/>
+    <A:notifications-URL/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/603-Soho-PROPFIND.result b/testing/tests/regression-suite/603-Soho-PROPFIND.result
index c381109d..cc96ce36 100644
--- a/testing/tests/regression-suite/603-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/603-Soho-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "2f8964c538b9af3411fdb033fe3a87bd"
-Content-Length: 3383
+ETag: "ea92b512c27205b703cb6f52043bb6d3"
+Content-Length: 4476
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -139,4 +139,48 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/calendar-proxy-read/</href>
+  <propstat>
+   <prop>
+    <C:calendar-home-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-home-set>
+    <C:calendar-user-address-set>
+     <href>mailto:user1@example.net</href>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-user-address-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <A:dropbox-home-URL/>
+    <A:notifications-URL/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/calendar-proxy-write/</href>
+  <propstat>
+   <prop>
+    <C:calendar-home-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-home-set>
+    <C:calendar-user-address-set>
+     <href>mailto:user1@example.net</href>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-user-address-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <A:dropbox-home-URL/>
+    <A:notifications-URL/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
index f6382d6c..3d41c8a0 100644
--- 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:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -48,100 +48,4 @@
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-read/</displayname>
-    <getlastmodified/>
-    <creationdate>YYYYMMDDThhmmss</creationdate>
-    <getetag>"911baff687b9d8f2d08039da7735c799"</getetag>
-    <acl>
-     <ace>
-      <principal>
-       <authenticated/>
-      </principal>
-      <grant>
-      </grant>
-     </ace>
-    </acl>
-    <getcontentlanguage/>
-    <supportedlock>
-     <lockentry>
-      <lockscope>
-       <exclusive/>
-      </lockscope>
-      <locktype>
-       <write/>
-      </locktype>
-     </lockentry>
-    </supportedlock>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <lockdiscovery/>
-    <source/>
-    <checked-in/>
-    <checked-out/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-write/</displayname>
-    <getlastmodified/>
-    <creationdate>YYYYMMDDThhmmss</creationdate>
-    <getetag>"a8d209934d2040570b50ac23ad2f7553"</getetag>
-    <acl>
-     <ace>
-      <principal>
-       <authenticated/>
-      </principal>
-      <grant>
-      </grant>
-     </ace>
-    </acl>
-    <getcontentlanguage/>
-    <supportedlock>
-     <lockentry>
-      <lockscope>
-       <exclusive/>
-      </lockscope>
-      <locktype>
-       <write/>
-      </locktype>
-     </lockentry>
-    </supportedlock>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <lockdiscovery/>
-    <source/>
-    <checked-in/>
-    <checked-out/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
index 1adbfbe6..e8f9f678 100644
--- a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
+++ b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
@@ -2,11 +2,11 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 ETag: "deadbeefcafefeeddeadbeefcafefeed"
-Content-Length: 3112
+Content-Length: 1130
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -48,86 +48,4 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-read/</displayname>
-    <getlastmodified/>
-    <creationdate>YYYYMMDDThhmmss</creationdate>
-    <getetag>"911baff687b9d8f2d08039da7735c799"</getetag>
-    <getcontentlanguage/>
-    <supportedlock>
-     <lockentry>
-      <lockscope>
-       <exclusive/>
-      </lockscope>
-      <locktype>
-       <write/>
-      </locktype>
-     </lockentry>
-    </supportedlock>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <lockdiscovery/>
-    <source/>
-    <checked-in/>
-    <checked-out/>
-    <bogus-property/>
-    <contentbogosity/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-write/</displayname>
-    <getlastmodified/>
-    <creationdate>YYYYMMDDThhmmss</creationdate>
-    <getetag>"a8d209934d2040570b50ac23ad2f7553"</getetag>
-    <getcontentlanguage/>
-    <supportedlock>
-     <lockentry>
-      <lockscope>
-       <exclusive/>
-      </lockscope>
-      <locktype>
-       <write/>
-      </locktype>
-     </lockentry>
-    </supportedlock>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <lockdiscovery/>
-    <source/>
-    <checked-in/>
-    <checked-out/>
-    <bogus-property/>
-    <contentbogosity/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
index cb5c20d8..f4b284be 100644
--- 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:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -39,84 +39,6 @@
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-read/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-read/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-read/</displayname>
-    <getlastmodified/>
-    <creationdate>YYYYMMDDThhmmss</creationdate>
-    <getetag>"911baff687b9d8f2d08039da7735c799"</getetag>
-    <getcontentlanguage/>
-    <supportedlock>
-     <lockentry>
-      <lockscope>
-       <exclusive/>
-      </lockscope>
-      <locktype>
-       <write/>
-      </locktype>
-     </lockentry>
-    </supportedlock>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <lockdiscovery/>
-    <source/>
-    <checked-in/>
-    <checked-out/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/calendar-proxy-write/</href>
-  <propstat>
-   <prop>
-    <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength/>
-    <resourcetype>
-     <collection/>
-     <principal/>
-     <C1:calendar-proxy-write/>
-    </resourcetype>
-    <displayname>/user1/home/calendar-proxy-write/</displayname>
-    <getlastmodified/>
-    <creationdate>YYYYMMDDThhmmss</creationdate>
-    <getetag>"a8d209934d2040570b50ac23ad2f7553"</getetag>
-    <getcontentlanguage/>
-    <supportedlock>
-     <lockentry>
-      <lockscope>
-       <exclusive/>
-      </lockscope>
-      <locktype>
-       <write/>
-      </locktype>
-     </lockentry>
-    </supportedlock>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <lockdiscovery/>
-    <source/>
-    <checked-in/>
-    <checked-out/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
   <propstat>
diff --git a/testing/tests/regression-suite/912-Space-PROPFIND.result b/testing/tests/regression-suite/912-Space-PROPFIND.result
index e00a9964..8cb2706b 100644
--- a/testing/tests/regression-suite/912-Space-PROPFIND.result
+++ b/testing/tests/regression-suite/912-Space-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "8510331a1f83da3f51348cf7afb611be"
-Content-Length: 1923
+ETag: "084b04273eb22d6346e371df5ea2a781"
+Content-Length: 3128
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -78,4 +78,52 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/User%20Six/calendar-proxy-read/</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <collection/>
+     <principal/>
+     <A:calendar-proxy-read/>
+    </resourcetype>
+    <displayname>/User Six/calendar-proxy-read/</displayname>
+    <A:getctag>"7032a440adf6aaab2a81cd3bc214d153"</A:getctag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C:calendar-free-busy-set/>
+    <C:calendar-description/>
+    <A1:calendar-color/>
+    <A1:calendar-order/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/User%20Six/calendar-proxy-write/</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <collection/>
+     <principal/>
+     <A:calendar-proxy-write/>
+    </resourcetype>
+    <displayname>/User Six/calendar-proxy-write/</displayname>
+    <A:getctag>"d729246362363c87ec3d13d6eaa99efa"</A:getctag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C:calendar-free-busy-set/>
+    <C:calendar-description/>
+    <A1:calendar-color/>
+    <A1:calendar-order/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
 </multistatus>