From cbfaf84f45dd9b1479bef7380f38a28569d2ed24 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Sat, 3 Apr 2010 09:21:50 +1300
Subject: [PATCH] Add facility to GET on collection of collections.

Including bound collections into the resultset.
---
 inc/caldav-GET.php                            |  14 +-
 .../regression-suite/995-GET-mashup.result    | 635 ++++++++++++++++++
 .../regression-suite/995-GET-mashup.test      |   9 +
 3 files changed, 655 insertions(+), 3 deletions(-)
 create mode 100644 testing/tests/regression-suite/995-GET-mashup.result
 create mode 100644 testing/tests/regression-suite/995-GET-mashup.test

diff --git a/inc/caldav-GET.php b/inc/caldav-GET.php
index a23c4e4d..5833f45d 100644
--- a/inc/caldav-GET.php
+++ b/inc/caldav-GET.php
@@ -40,7 +40,7 @@ function obfuscate_event( $resource ) {
 
 
 if ( $dav_resource->IsCollection() ) {
-  if ( ! $dav_resource->IsCalendar() ) {
+  if ( ! $dav_resource->IsCalendar() && !(isset($c->get_includes_subcollections) && $c->get_includes_subcollections) ) {
     /** RFC2616 says we must send an Allow header if we send a 405 */
     header("Allow: PROPFIND,PROPPATCH,OPTIONS,MKCOL,REPORT,DELETE");
     $request->DoResponse( 405, translate("GET requests on collections are only supported for calendars.") );
@@ -51,9 +51,17 @@ if ( $dav_resource->IsCollection() ) {
   * used as a .ics download for the whole collection, which is what we do also.
   */
   $sql = 'SELECT caldav_data, class, caldav_type, calendar_item.user_no, logged_user ';
-  $sql .= 'FROM caldav_data INNER JOIN calendar_item USING ( dav_id ) WHERE caldav_data.collection_id = :collection_id ';
+  $sql .= 'FROM collection INNER JOIN caldav_data USING(collection_id) INNER JOIN calendar_item USING ( dav_id ) WHERE ';
+  if ( isset($c->get_includes_subcollections) && $c->get_includes_subcollections ) {
+    $sql .= '(collection.dav_name ~ :path_match ';
+    $sql .= 'OR collection.collection_id IN (SELECT bound_source_id FROM dav_binding WHERE dav_binding.dav_name ~ :path_match)) ';
+    $params = array( ':path_match' => '^'.$request->path );
+  }
+  else {
+    $sql .= 'caldav_data.collection_id = :collection_id ';
+    $params = array( ':collection_id' => $dav_resource->resource_id() );
+  }
   if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) $sql .= ' ORDER BY dav_id';
-  $params = array( ':collection_id' => $dav_resource->resource_id() );
 
   $qry = new AwlQuery( $sql, $params );
   if ( !$qry->Exec("GET",__LINE__,__FILE__) ) {
diff --git a/testing/tests/regression-suite/995-GET-mashup.result b/testing/tests/regression-suite/995-GET-mashup.result
new file mode 100644
index 00000000..f782a897
--- /dev/null
+++ b/testing/tests/regression-suite/995-GET-mashup.result
@@ -0,0 +1,635 @@
+HTTP/1.1 200 OK
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
+Content-Length: 18996
+Etag: "ae93907cb03bc025b8e733eb61f3a09e"
+Content-Type: text/calendar; charset="utf-8"
+
+BEGIN:VCALENDAR
+PRODID:-//davical.org//NONSGML AWL Calendar//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+X-WR-CALNAME:A normal collection
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Near Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR
+DTSTART;TZID=Pacific/Auckland:20081020T110000
+DTEND;TZID=Pacific/Auckland:20081020T113000
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054934Z
+LAST-MODIFIED:20081023T055059Z
+DTSTAMP:20081023T054934Z
+UID:047871e3-6b70-4178-9af8-0ceb50f7b092
+SUMMARY:Weekly Project Meeting
+RRULE:FREQ=WEEKLY;INTERVAL=1
+DTSTART;TZID=Pacific/Auckland:20081020T090000
+DTEND;TZID=Pacific/Auckland:20081020T100000
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T055115Z
+LAST-MODIFIED:20081023T055139Z
+DTSTAMP:20081023T055115Z
+UID:9429a973-2b13-4b1a-be09-948d75425c45
+SUMMARY:Weekly catch-up
+RRULE:FREQ=WEEKLY;INTERVAL=1
+DTSTART;TZID=Pacific/Auckland:20081024T140000
+DTEND;TZID=Pacific/Auckland:20081024T150000
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20080303T015422Z
+SEQUENCE:5
+UID:7d729xc0-0895-012d-124e-002421a2359e
+SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday
+RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1
+DESCRIPTION:An all day event on various days.
+DTSTART;TZID=America/Los_Angeles:20081006T000000
+CREATED:20080303T015329Z
+DTSTAMP:20080303T015422Z
+DURATION:P1D
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20081123T210725Z
+SEQUENCE:6
+UID:bd262d20-1cdb-012d-1264-002421a2359e
+SUMMARY:Afternoon run
+DESCRIPTION:
+DTSTART;TZID=America/Los_Angeles:20081123T150000
+CREATED:20081123T210644Z
+DTSTAMP:20081123T210725Z
+DURATION:PT1H
+LOCATION:
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20061102T090217Z
+DTSTART;TZID=New Zealand Standard Time:20061102T123000
+DURATION:PT1H
+LAST-MODIFIED:20061104T002921Z
+SEQUENCE:1
+SUMMARY:Lunch with David
+UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
+END:VEVENT
+BEGIN:VEVENT
+UID:20061101T073000Z-10468-1000-1-7@ubu
+DTSTAMP:20061101T073000Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061101T100000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061101T110000
+SUMMARY:A Meeting
+X-EVOLUTION-CALDAV-HREF:http://user1@mycaldav/caldav.php/user1/home/20061101T073004Z.ics
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20061101T073000Z-10480-1000-1-5@ubu
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+DESCRIPTION:A Meeting
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20061120T041336Z
+LAST-MODIFIED:20061120T041709Z
+DTSTAMP:20061120T041709Z
+UID:4aaf8f37-f232-4c8e-a72e-e171d4c4fe54
+SUMMARY:Weekly Project Meeting
+PRIORITY:0
+CLASS:PUBLIC
+RRULE:FREQ=WEEKLY;COUNT=26;INTERVAL=1;BYDAY=TH
+DTSTART;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061102T100000
+DTEND;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061102T110000
+CATEGORIES:Projects
+X-MOZ-LOCATIONPATH:4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20061223T032350Z
+LAST-MODIFIED:20061223T033144Z
+DTSTAMP:20061223T033144Z
+UID:9d050be7-8a02-4355-8ed3-02a9fc5f473f
+SUMMARY:Confidential Event
+PRIORITY:0
+STATUS:CONFIRMED
+CLASS:CONFIDENTIAL
+DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T160000
+DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T180000
+X-MOZ-LOCATIONPATH:9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics
+LOCATION:In a confidential place
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20061223T031415Z
+LAST-MODIFIED:20061223T032305Z
+DTSTAMP:20061223T032305Z
+UID:1906b3ca-4890-468a-9b58-1de74bf2c716
+SUMMARY:Private Event
+PRIORITY:0
+STATUS:CONFIRMED
+CLASS:PRIVATE
+DTSTART;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T130000
+DTEND;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T150000
+X-MOZ-LOCATIONPATH:1906b3ca-4890-468a-9b58-1de74bf2c716.ics
+LOCATION:At a private location
+DESCRIPTION:Private and Confirmed
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20061223T051646Z
+LAST-MODIFIED:20061223T051713Z
+DTSTAMP:20061223T051713Z
+UID:fbd57454-d966-4a14-8341-abe1edb1ae66
+SUMMARY:Tentative Event
+STATUS:TENTATIVE
+CLASS:PUBLIC
+DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T190000
+DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T210000
+X-MOZ-LOCATIONPATH:fbd57454-d966-4a14-8341-abe1edb1ae66.ics
+LOCATION:Never never land
+END:VEVENT
+BEGIN:VTODO
+CREATED:20070805T200215Z
+LAST-MODIFIED:20070805T201531Z
+DTSTAMP:20070805T200215Z
+UID:2178279a-aec2-471f-832d-1f6df6203f2f
+SUMMARY:Incomplete\, uncancelled
+X-MOZ-LOCATIONPATH:2178279a-aec2-471f-832d-1f6df6203f2f.ics
+DESCRIPTION:This task is incomplete and has not been cancelled (has no 
+ status at all)
+END:VTODO
+BEGIN:VTODO
+CREATED:20070805T201557Z
+LAST-MODIFIED:20070805T201643Z
+DTSTAMP:20070805T201557Z
+UID:917b9e47-b748-4550-a566-657fbe672447
+SUMMARY:50% Complete\, uncancelled
+STATUS:IN-PROCESS
+PERCENT-COMPLETE:50
+X-MOZ-LOCATIONPATH:917b9e47-b748-4550-a566-657fbe672447.ics
+DESCRIPTION:This task is in progress (50% complete) and has not been 
+ cancelled.
+END:VTODO
+BEGIN:VTODO
+CREATED:20070805T201647Z
+LAST-MODIFIED:20070805T201834Z
+DTSTAMP:20070805T201647Z
+UID:0575d895-a006-4ed8-9be6-0d1b6b6b1f96
+SUMMARY:Due 7/8/7 16:30\, completed
+STATUS:COMPLETED
+DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070807T163000
+COMPLETED:20070805T201737Z
+PERCENT-COMPLETE:100
+X-MOZ-LOCATIONPATH:0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics
+DESCRIPTION:Due on 7/8/7 at 4:30pm\, but completed alread on 6/8/7
+CATEGORIES:Projects
+END:VTODO
+BEGIN:VTODO
+CREATED:20070806T223244Z
+LAST-MODIFIED:20070806T223411Z
+DTSTAMP:20070806T223244Z
+UID:b1679f77-673d-4f46-b3eb-2420e1bba301
+SUMMARY:A Cancelled Task\, with a start and due date
+STATUS:CANCELLED
+DTSTART;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070808T111500
+DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070808T111500
+X-MOZ-LOCATIONPATH:b1679f77-673d-4f46-b3eb-2420e1bba301.ics
+DESCRIPTION:This is a task with a Start and a Due date\, but it has been 
+ cancelled.
+END:VTODO
+BEGIN:VEVENT
+CREATED:20071203T202630Z
+LAST-MODIFIED:20071203T202834Z
+DTSTAMP:20071203T202630Z
+UID:e70576e9-c1e0-431e-a507-0386fd82f223
+SUMMARY:Morning Meeting
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,TH
+DTSTART;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071211T074500
+DTEND;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071211T083000
+X-MOZ-LOCATIONPATH:e70576e9-c1e0-431e-a507-0386fd82f223.ics
+LOCATION:Suzies Coffee Lounge
+DESCRIPTION:Twice-weekly breakfast meeting
+CATEGORIES:Business
+BEGIN:VALARM
+TRIGGER;VALUE=DURATION:-PT10M
+DESCRIPTION:Mozilla Alarm: Morning Meeting
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+BEGIN:VTODO
+CREATED:20071203T202915Z
+LAST-MODIFIED:20071203T203021Z
+DTSTAMP:20071203T202915Z
+UID:e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08
+SUMMARY:Release 0.9.3
+STATUS:IN-PROCESS
+DTSTART;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071209T133000
+DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071209T133000
+PERCENT-COMPLETE:95
+X-MOZ-LOCATIONPATH:e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics
+BEGIN:VALARM
+TRIGGER;VALUE=DURATION:-P2D
+DESCRIPTION:Mozilla Alarm: Release 0.9.3
+ACTION:DISPLAY
+END:VALARM
+END:VTODO
+BEGIN:VEVENT
+UID:71e2ae82-7870-11db-c6d6-f6927c144649
+DTSTART;TZID=Pacific/Auckland:20061103T160000
+DTEND;TZID=Pacific/Auckland:20061103T174500
+DESCRIPTION:
+LOCATION:Level 3
+RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=20071222T235900
+STATUS:CONFIRMED
+SUMMARY:Beer O'Clock
+END:VEVENT
+BEGIN:VEVENT
+UID:da81c0ee-7871-11db-c6d6-f6927c144649
+DTSTART:20061103T073000
+DTEND:20061103T093000
+DESCRIPTION:
+LOCATION:Olivia's
+RRULE:FREQ=MONTHLY
+STATUS:CONFIRMED
+SUMMARY:Morning Mgmt Mtg
+END:VEVENT
+BEGIN:VEVENT
+SEQUENCE:6
+TRANSP:OPAQUE
+UID:AAA9318E-37D9-4319-8626-95ECD3D3B243
+DTSTART;TZID=Pacific/Auckland:20071125T130000
+DTSTAMP:20071123T093223Z
+SUMMARY:BBQ @ ML's
+CREATED:20071123T093048Z
+DTEND;TZID=Pacific/Auckland:20071125T190000
+LOCATION:ML's House
+BEGIN:VALARM
+X-WR-ALARMUID:2927836F-DF85-4688-901A-9ABE442BFB62
+ACTION:AUDIO
+TRIGGER:-PT15M
+ATTACH;VALUE=URI:Basso
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20091006T225807Z
+UID:70D23799-4A68-4905-AB9F-4D47BA693CFD
+DTEND;TZID=Europe/Prague:20091005T150000
+TRANSP:OPAQUE
+SUMMARY:New Event
+DTSTART;TZID=Europe/Prague:20091005T140000
+DTSTAMP:20091006T225808Z
+SEQUENCE:1
+END:VEVENT
+BEGIN:VEVENT
+DESCRIPTION:Have a party. All the best parties are monthly!
+UID:DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74
+DTSTAMP:20081024T220925Z
+SUMMARY:Party all day!
+CREATED:20081024T220749Z
+DTSTART;TZID=Pacific/Auckland;VALUE=DATE:20081114
+RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=2FR
+END:VEVENT
+BEGIN:VEVENT
+DESCRIPTION:Have a microparty. All the best parties are monthly!
+UID:MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74
+DTSTAMP:20081024T220925Z
+SUMMARY:Woohoo!  Time to Par-tay!
+CREATED:20081024T220749Z
+DTSTART;TZID=Pacific/Auckland:20081121T160000
+RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=3FR
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20100318T044409Z
+LAST-MODIFIED:20100318T044451Z
+DTSTAMP:20100318T044451Z
+UID:9f81cd8a-b1c2-4f72-9f12-1ddbddd69342
+SUMMARY:Test adding an event to a bound collection
+RRULE:FREQ=WEEKLY;INTERVAL=2
+DTSTART;TZID=Pacific/Auckland:20100322T180000
+DTEND;TZID=Pacific/Auckland:20100322T190000
+LOCATION:Somewhere else
+DESCRIPTION:This event is being added to a bound collection.
+END:VEVENT
+BEGIN:VTODO
+PRIORITY:0
+SEQUENCE:4
+DTSTART;TZID=Pacific/Auckland:20040101T120000
+UID:A51AC037-E6F9-4E03-872C-7DFE0B67D1FF
+DTSTAMP:20100318T210557Z
+SUMMARY:Release DAViCal 0.9.9
+CREATED:20100318T210457Z
+X-APPLE-SORT-ORDER:2147483647
+DUE;VALUE=DATE:20100326
+END:VTODO
+BEGIN:VEVENT
+CREATED:20100319T103247Z
+LAST-MODIFIED:20100319T105620Z
+DTSTAMP:20100319T105620Z
+UID:70399cd7-50a4-4be4-a665-af593e19a7fd
+SUMMARY:An invited event.  Black tie with pink polka dots is essential.  
+ Do not bring a leopard.  Any leopards which do attend will be forcibly 
+ chained to a nearby fence.
+ORGANIZER;RSVP=TRUE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:user1@example.net
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:user2@example.net
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:user3@example.net
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:user4@example.net
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:user5@example.net
+DTSTART:20100322T160000
+DTEND:20100322T170000
+X-MOZ-GENERATION:3
+TRANSP:OPAQUE
+X-MOZ-SEND-INVITATIONS:TRUE
+SEQUENCE:1
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100125T214235Z
+SEQUENCE:1
+UID:73d1f980-ec28-012c-11f9-002421a2359e
+SUMMARY:HELLO
+DESCRIPTION:
+DTSTART;VALUE=DATE-TIME;TZID=America/Los_Angeles:20100105T140000
+CREATED:20100125T214226Z
+DTSTAMP:20100125T214235Z
+DURATION:PT1H
+LOCATION:
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100311T220844Z
+SEQUENCE:18
+URL;VALUE=URI:http://www.macwfc.org
+UID:939afe30-0f86-012d-1259-002421a2359e
+SUMMARY:Youngberg Hill @ McMinniville Wine & Food Festival
+DESCRIPTION:March 12-14th McMinniville Wine & Food Festival\nCome visit 
+ Youngberg Hill at this wonderful festival. \nwww.macwfc.org\n\n
+DTSTART;TZID=America/Los_Angeles:20100312T110000
+CREATED:20100311T215422Z
+DTSTAMP:20100311T220844Z
+DURATION:P2DT5H
+LOCATION:
+X-VENUE:Evergreen Aviation\, McMnnville OR
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100311T222451Z
+SEQUENCE:11
+URL;VALUE=URI:http://www.theoregonwineandartauction.org/
+UID:12cbff90-0f8a-012d-1259-002421a2359e
+SUMMARY:Youngberg Hill @ Uncorked\, Oregon Wine & Art Auction 
+DESCRIPTION:July 10th - Uncorked\, Oregon Wine & Art Auction\n\nCome join 
+ Youngberg Hill for this wonderful event.
+DTSTART;TZID=America/Los_Angeles:20100710T160000
+CREATED:20100311T221924Z
+DTSTAMP:20100311T222451Z
+DURATION:PT4H30M
+LOCATION:11400 Westland Lane\, Dayton OR
+X-VENUE:The Methven Family Vineyards
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100311T231118Z
+SEQUENCE:7
+UID:242afc80-0f8c-012d-1259-002421a2359e
+SUMMARY:Pre- IPNC Winemaker Dinner @ Youngberg Hill
+DESCRIPTION:July 22nd - PRE-IPNC Winemaker Dinner @ Youngberg 
+ Hill.\n\nDetails to follow.
+DTSTART;TZID=America/Los_Angeles:20100722T183000
+CREATED:20100311T223412Z
+DTSTAMP:20100311T231118Z
+DURATION:PT30M
+LOCATION:
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100311T220308Z
+SEQUENCE:8
+URL;VALUE=URI:http://www.stephanie-inn.com
+UID:950ca060-0f87-012d-1259-002421a2359e
+SUMMARY:Youngberg Hill Winemaker Dinner @ The Stephanie Inn
+DESCRIPTION:May 2 - Stephanie Inn Winemaker Dinner @ Cannon Beach\nCome 
+ join Youngberg Hill Vineyards & Inn for this wonderful experience. 
+ Details at \nwww.stephanie-inn.com\n\n
+DTSTART;TZID=America/Los_Angeles:20100502T180000
+CREATED:20100311T220134Z
+DTSTAMP:20100311T220308Z
+DURATION:PT3H30M
+LOCATION:Cannon Beach\, OR
+X-VENUE:The Stephanie Inn
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100311T231101Z
+SEQUENCE:0
+UID:4887b3b0-0f91-012d-1259-002421a2359e
+SUMMARY:New Event
+DESCRIPTION:
+DTSTART;TZID=America/Los_Angeles:20100716T150000
+CREATED:20100311T231101Z
+DTSTAMP:20100311T231101Z
+DURATION:PT1H
+LOCATION:
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100311T223312Z
+SEQUENCE:9
+URL;VALUE=URI:http://www.mcminnvilleava.org/event.htm
+UID:ed3beb90-0f8a-012d-1259-002421a2359e
+SUMMARY:Discover McMinnville AVA
+DESCRIPTION:July 17th - Discover McMinnville AVA\n\nParticipating 
+ Wineries Include:\nBrittan Vineyards\, Coeur de Terre Vineyard\, Coleman 
+ Vineyard\, Maysara Vineyard\, Seufert Winery\, Stony Mountain Vineyard\, 
+ Yamhill Valley Vineyards and Youngberg Hill Vineyard
+DTSTART;TZID=America/Los_Angeles:20100717T100000
+CREATED:20100311T222531Z
+DTSTAMP:20100311T223312Z
+DURATION:PT7H
+LOCATION:16250 SW Oldsville Rd\, McMinnville OR
+X-VENUE:Yamhill Valley Vineyards
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100312T064055Z
+SEQUENCE:9
+URL;VALUE=URI:http://www.youngberghill.com
+UID:626c1f10-0f91-012d-1259-002421a2359e
+SUMMARY:Linfield Chamber Benefit @ Youngberg Hill
+DESCRIPTION:August 12th - Linfield Chamber Benefit @ Youngberg 
+ Hill\n\nDetails to follow
+DTSTART;TZID=America/Los_Angeles:20100812T180000
+CREATED:20100311T231144Z
+DTSTAMP:20100312T064055Z
+DURATION:PT2H30M
+LOCATION:10660 SW Youngberg Hill Road\, McMinniville OR
+X-VENUE:Youngberg Hill
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100311T221206Z
+SEQUENCE:8
+URL;VALUE=URI:http://www.youngberghill.com
+UID:b0362430-0f88-012d-1259-002421a2359e
+SUMMARY:Youngberg Hill Vineyard & Inn - Memorial Weekend
+DESCRIPTION:Memorial Weekend\nYoungberg Hill will be open from 11:00 to 
+ 5:00 on Saturday\, Sunday\, & Monday. We will be highlighting our 2007 
+ Jordan & Natasha Block Pinot Noir as well as our newly released 2009 
+ Pinot Gris. We will have cheeses\, breads\, and treats available\, plus 
+ the greatest view.\n\nTasting fee of $5\, complimentary tastings for our 
+ Wine Club members. \n
+DTSTART;TZID=America/Los_Angeles:20100529T110000
+CREATED:20100311T220929Z
+DTSTAMP:20100311T221206Z
+DURATION:P2DT6H
+LOCATION:10660 SW Youngberg Hill Road
+X-VENUE:McMinnville\, OR
+END:VEVENT
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19700927T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=9
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700405T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:America/Los_Angeles
+X-TZINFO:America/Los_Angeles[2007g/Partial@883612800000]
+BEGIN:DAYLIGHT
+TZOFFSETTO:-0700
+TZOFFSETFROM:-0800
+TZNAME:America/Los_Angeles(DST)
+DTSTART:19980405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060403T100000Z;BYMONTH=4;BYDAY=1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:-0800
+TZOFFSETFROM:-0700
+TZNAME:America/Los_Angeles(STD)
+DTSTART:19981025T020000
+RRULE:FREQ=YEARLY;UNTIL=20061030T100000Z;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETTO:-0700
+TZOFFSETFROM:-0800
+TZNAME:America/Los_Angeles(DST)
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETTO:-0800
+TZOFFSETFROM:-0700
+TZNAME:America/Los_Angeles(STD)
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:New Zealand Standard Time
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Pacific/Auckland
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20050126_1/Pacific/Auckland
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
+X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20070129_1/Antarctica/McMurdo
+X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:Europe/Prague
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+DTSTART:19810329T020000
+TZNAME:GMT+02:00
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+DTSTART:19961027T030000
+TZNAME:GMT+01:00
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR
diff --git a/testing/tests/regression-suite/995-GET-mashup.test b/testing/tests/regression-suite/995-GET-mashup.test
new file mode 100644
index 00000000..eaf70b7b
--- /dev/null
+++ b/testing/tests/regression-suite/995-GET-mashup.test
@@ -0,0 +1,9 @@
+#
+# Doing a GET on a collection of collections.
+#
+
+TYPE=GET
+URL=http://regression.host/caldav.php/user4/base/
+HEAD
+
+AUTH=user4:user4