From e957cab57a6a4000f5e2fcdc47a0e646bc05b539 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Thu, 7 Dec 2006 15:35:38 +1300
Subject: [PATCH] More Chandler imitation changes with 0.7 Alpha4

---
 .../309-Chandler-PROPFIND-3.result            | 49 ++-------------
 .../309-Chandler-PROPFIND-4.result            | 62 +++++++++++++++++++
 .../309-Chandler-PROPFIND-4.test              | 14 +++++
 3 files changed, 81 insertions(+), 44 deletions(-)
 create mode 100644 testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
 create mode 100644 testing/tests/regression-suite/309-Chandler-PROPFIND-4.test

diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-3.result b/testing/tests/regression-suite/309-Chandler-PROPFIND-3.result
index 7c1dbcf6..d733f1d7 100644
--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-3.result
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-3.result
@@ -1,60 +1,21 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "c7860d07796d894f7922e92f28c88836"
-Content-Length: 1492
+ETag: "f81b76c70be67ab1e4f0e3c1eb7fd5f5"
+Content-Length: 465
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
  <response>
-  <href>/caldav.php/user1/home/</href>
+  <href>/caldav.php/user1/home/.chandler/</href>
   <propstat>
    <prop>
     <resourcetype>
      <collection/>
      <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
     </resourcetype>
-    <displayname>home</displayname>
-    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
-    <displayname/>
-    <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
-    <displayname/>
-    <getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
-  <propstat>
-   <prop>
-    <resourcetype>
-     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-    </resourcetype>
-    <displayname/>
-    <getetag>"a1c6404d61190f9574e2bfd69383f144"</getetag>
+    <displayname>/user1/home/.chandler/</displayname>
+    <getetag>"a150b8e5ab38926a153b90c6546dc610"</getetag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
new file mode 100644
index 00000000..7c1dbcf6
--- /dev/null
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
@@ -0,0 +1,62 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+ETag: "c7860d07796d894f7922e92f28c88836"
+Content-Length: 1492
+Content-Type: text/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:">
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <collection/>
+     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+    </resourcetype>
+    <displayname>home</displayname>
+    <getetag>"faf25336de0e470a54075c14cbcf5272"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+    </resourcetype>
+    <displayname/>
+    <getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+    </resourcetype>
+    <displayname/>
+    <getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
+    </resourcetype>
+    <displayname/>
+    <getetag>"a1c6404d61190f9574e2bfd69383f144"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>
diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.test b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.test
new file mode 100644
index 00000000..f8a30b4a
--- /dev/null
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.test
@@ -0,0 +1,14 @@
+#
+# At this point Chandler does a PROPFIND on /user1/home/
+# an OPTIONS on that).
+# Still Depth: 0 at this point...
+#
+TYPE=PROPFIND
+URL=http://mycaldav/caldav.php/user1/home/
+HEADER=Depth: infinity
+HEADER=Content-Type: text/xml; charset=utf-8
+HEADER=Chandler/0.7alpha4 (Linux)
+HEAD
+
+# The data from our first Chandler-like PROPFIND
+DATA=303-Chandler-PROPFIND-1