diff --git a/testing/tests/binding/1000-BIND.result b/testing/tests/binding/1000-BIND.result index 353b0a8e..dadb016a 100644 --- a/testing/tests/binding/1000-BIND.result +++ b/testing/tests/binding/1000-BIND.result @@ -7,7 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1601< + bind_id: >1602< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/user2/< diff --git a/testing/tests/binding/1001-BIND.result b/testing/tests/binding/1001-BIND.result index f10b1248..d5973c08 100644 --- a/testing/tests/binding/1001-BIND.result +++ b/testing/tests/binding/1001-BIND.result @@ -9,7 +9,7 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. - bind_id: >1601< + bind_id: >1602< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/user2/< diff --git a/testing/tests/binding/1004-PROPFIND-bound.result b/testing/tests/binding/1004-PROPFIND-bound.result index d3717e62..eddca1c2 100644 --- a/testing/tests/binding/1004-PROPFIND-bound.result +++ b/testing/tests/binding/1004-PROPFIND-bound.result @@ -118,7 +118,7 @@ User 4 Outbox - /caldav.php/.resources/1599 + /caldav.php/.resources/1600 diff --git a/testing/tests/binding/1012-BIND.result b/testing/tests/binding/1012-BIND.result index 7edf19d9..4f8397b2 100644 --- a/testing/tests/binding/1012-BIND.result +++ b/testing/tests/binding/1012-BIND.result @@ -7,14 +7,14 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1601< + bind_id: >1602< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< parent_container: >/user4/< ticket_id_length: >8< - bind_id: >1602< + bind_id: >1603< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< diff --git a/testing/tests/binding/1022-BIND.result b/testing/tests/binding/1022-BIND.result index e99edf0c..245b5409 100644 --- a/testing/tests/binding/1022-BIND.result +++ b/testing/tests/binding/1022-BIND.result @@ -7,21 +7,21 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1601< + bind_id: >1602< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1602< + bind_id: >1603< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1606< + bind_id: >1607< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< diff --git a/testing/tests/binding/1023-BIND.result b/testing/tests/binding/1023-BIND.result index a843d9fb..85c0dc10 100644 --- a/testing/tests/binding/1023-BIND.result +++ b/testing/tests/binding/1023-BIND.result @@ -7,28 +7,28 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1601< + bind_id: >1602< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1602< + bind_id: >1603< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1606< + bind_id: >1607< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1607< + bind_id: >1608< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< diff --git a/testing/tests/binding/1024-BIND.result b/testing/tests/binding/1024-BIND.result index 0b71d540..8bc19aed 100644 --- a/testing/tests/binding/1024-BIND.result +++ b/testing/tests/binding/1024-BIND.result @@ -9,28 +9,28 @@ Content-Type: text/xml; charset="utf-8" A resource already exists at the destination. - bind_id: >1601< + bind_id: >1602< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1602< + bind_id: >1603< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1606< + bind_id: >1607< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1607< + bind_id: >1608< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< diff --git a/testing/tests/binding/1025-PROPFIND.result b/testing/tests/binding/1025-PROPFIND.result index 155d7f04..c4cdbcfc 100644 --- a/testing/tests/binding/1025-PROPFIND.result +++ b/testing/tests/binding/1025-PROPFIND.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1604 + /caldav.php/.resources/1605 @@ -90,7 +90,7 @@ A sub collection - /caldav.php/.resources/1605 + /caldav.php/.resources/1606 diff --git a/testing/tests/binding/1027-PROPFIND.result b/testing/tests/binding/1027-PROPFIND.result index 6d61d644..1d0e95d0 100644 --- a/testing/tests/binding/1027-PROPFIND.result +++ b/testing/tests/binding/1027-PROPFIND.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1604 + /caldav.php/.resources/1605 diff --git a/testing/tests/binding/1032-BIND-admin.result b/testing/tests/binding/1032-BIND-admin.result index 6a3e155e..fbf94101 100644 --- a/testing/tests/binding/1032-BIND-admin.result +++ b/testing/tests/binding/1032-BIND-admin.result @@ -7,7 +7,7 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1601< + bind_id: >1602< bind_owner: >1005< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< @@ -19,7 +19,7 @@ target_collection: >11< target_resource_i: >NULL< ticket_owner: >1003< - bind_id: >1602< + bind_id: >1603< bind_owner: >1005< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< @@ -31,7 +31,7 @@ target_collection: >10< target_resource_i: >NULL< ticket_owner: >1002< - bind_id: >1606< + bind_id: >1607< bind_owner: >1005< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< @@ -43,7 +43,7 @@ target_collection: >10< target_resource_i: >NULL< ticket_owner: >1002< - bind_id: >1607< + bind_id: >1608< bind_owner: >1005< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< @@ -55,7 +55,7 @@ target_collection: >11< target_resource_i: >NULL< ticket_owner: >1003< - bind_id: >1628< + bind_id: >1629< bind_owner: >1< bound_source_id: >12< dav_displayname: >user3 home< diff --git a/testing/tests/binding/1034-DELETE-admin-bind.result b/testing/tests/binding/1034-DELETE-admin-bind.result index 3bab3301..3aabc725 100644 --- a/testing/tests/binding/1034-DELETE-admin-bind.result +++ b/testing/tests/binding/1034-DELETE-admin-bind.result @@ -6,14 +6,14 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1606< + bind_id: >1607< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< dav_owner_id: >1005< parent_container: >/user4/base/< - bind_id: >1607< + bind_id: >1608< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< diff --git a/testing/tests/binding/1035-GET-mashup.result b/testing/tests/binding/1035-GET-mashup.result index 9d794fd3..fcd40f3a 100644 --- a/testing/tests/binding/1035-GET-mashup.result +++ b/testing/tests/binding/1035-GET-mashup.result @@ -2,7 +2,7 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -Content-Length: 21698 +Content-Length: 22330 Etag: "ae93907cb03bc025b8e733eb61f3a09e" Content-Type: text/calendar; charset="utf-8" @@ -319,6 +319,16 @@ DTSTAMP:20111004T153507Z SEQUENCE:1 END:VEVENT BEGIN:VEVENT +CREATED:20111004T153507Z +UID:0545-deflate-PUT +TRANSP:OPAQUE +SUMMARY:In Prague, 10am, Oct 7th for 1 hour +DTSTART;TZID=Prague_in_Central_Europe:20111007T100000 +DURATION:PT1H +DTSTAMP:20111004T153507Z +SEQUENCE:1 +END:VEVENT +BEGIN:VEVENT DESCRIPTION:Have a party. All the best parties are monthly! UID:DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74 DTSTAMP:20081024T220925Z @@ -712,4 +722,22 @@ TZNAME:GMT+01:00 TZOFFSETTO:+0100 END:STANDARD END:VTIMEZONE +BEGIN:VTIMEZONE +TZID:Prague_in_Central_Europe +X-MICROSOFT-CDO-TZID:4 +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/binding/1100-BIND.result b/testing/tests/binding/1100-BIND.result index b09a95e6..f61e90ec 100644 --- a/testing/tests/binding/1100-BIND.result +++ b/testing/tests/binding/1100-BIND.result @@ -7,36 +7,36 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - bind_id: >1601< + bind_id: >1602< bound_source_id: >11< dav_displayname: >Updated Displayname with PROPPATCH< dav_name: >/user4/user2/< length: >8< parent_container: >/user4/< - bind_id: >1602< + bind_id: >1603< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/user1/< length: >8< parent_container: >/user4/< - bind_id: >1606< + bind_id: >1607< bound_source_id: >10< dav_displayname: >User 1's Calendaranza< dav_name: >/user4/base/user1/< length: >8< parent_container: >/user4/base/< - bind_id: >1607< + bind_id: >1608< bound_source_id: >11< dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_name: >/user4/base/user2/< length: >8< parent_container: >/user4/base/< - bind_id: >1629< - bound_source_id: >1604< + bind_id: >1630< + bound_source_id: >1605< dav_displayname: >A normal collection< dav_name: >/user4/boundbase/< length: >NULL< diff --git a/testing/tests/binding/1101-PROPFIND-normal.result b/testing/tests/binding/1101-PROPFIND-normal.result index b542230b..649501cd 100644 --- a/testing/tests/binding/1101-PROPFIND-normal.result +++ b/testing/tests/binding/1101-PROPFIND-normal.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1604 + /caldav.php/.resources/1605 @@ -90,7 +90,7 @@ A sub collection - /caldav.php/.resources/1605 + /caldav.php/.resources/1606 @@ -112,7 +112,7 @@ newcalendar - /caldav.php/.resources/1618 + /caldav.php/.resources/1619 diff --git a/testing/tests/binding/1102-PROPFIND-bound.result b/testing/tests/binding/1102-PROPFIND-bound.result index 70cdfcff..b4cc683f 100644 --- a/testing/tests/binding/1102-PROPFIND-bound.result +++ b/testing/tests/binding/1102-PROPFIND-bound.result @@ -6,7 +6,7 @@ A normal collection - /caldav.php/.resources/1604 + /caldav.php/.resources/1605 @@ -99,7 +99,7 @@ A sub collection - /caldav.php/.resources/1605 + /caldav.php/.resources/1606 @@ -125,7 +125,7 @@ newcalendar - /caldav.php/.resources/1618 + /caldav.php/.resources/1619 diff --git a/testing/tests/binding/Restore-Database.result b/testing/tests/binding/Restore-Database.result index 9fbcd37f..2a81253e 100644 --- a/testing/tests/binding/Restore-Database.result +++ b/testing/tests/binding/Restore-Database.result @@ -1,6 +1,6 @@ setval -------- - 1600 + 1601 (1 row) setval @@ -30,7 +30,7 @@ setval -------- - 12 + 13 (1 row) setval diff --git a/testing/tests/carddav/Restore-Database.result b/testing/tests/carddav/Restore-Database.result index 5388b0a6..25703e47 100644 --- a/testing/tests/carddav/Restore-Database.result +++ b/testing/tests/carddav/Restore-Database.result @@ -1,6 +1,6 @@ setval -------- - 1629 + 1630 (1 row) setval @@ -30,7 +30,7 @@ setval -------- - 12 + 13 (1 row) setval diff --git a/testing/tests/regression-suite/0545-deflate-PUT.data b/testing/tests/regression-suite/0545-deflate-PUT.data new file mode 100644 index 00000000..dfb556d2 --- /dev/null +++ b/testing/tests/regression-suite/0545-deflate-PUT.data @@ -0,0 +1,3 @@ +}Ao0!vQ\q0:/"6hpطCh+m99{^ʕ2l4;.SְhDPPaXTe:Fa(>WdDP YOa+'W)nr`rgD-xթk< +=Zf6 6\!Zg$$$jvG(!ȹܗM|ZM,5^\4ˑ F9 ^[ec(gOK`>.O_J.4FI427B*i|e|\n;A +J xJf;ht2 ^4:nٔ?eL0{LICg]_S\7~d b\пz`5^Ēѡա \ No newline at end of file diff --git a/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.result b/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.result new file mode 100644 index 00000000..89e3ea36 --- /dev/null +++ b/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.result @@ -0,0 +1,8 @@ +HTTP/1.1 201 Created +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +ETag: "4a3aa58a3e11487e87d87024465d4182" +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.test b/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.test new file mode 100644 index 00000000..60092650 --- /dev/null +++ b/testing/tests/regression-suite/0545-iCLoud-PUT-encoded.test @@ -0,0 +1,14 @@ +# +# Testing with a process similar to iCal4 +# +TYPE=PUT +URL=http://regression.host/caldav.php/user1/home/0545-deflate-PUT.ics +HEAD + +HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) +HEADER=Content-Type: text/calendar +HEADER=Content-Encoding: deflate + +# +# +DATA=0545-deflate-PUT diff --git a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result index bab42055..a5f4e551 100644 --- a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result +++ b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result @@ -2,7 +2,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 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "2bac61d8cc65cae86757a7dd00eef4e2" +ETag: "4f2f5fe4966246175dfc7a90396422d2" Content-Length: 12754 Content-Type: text/xml; charset="utf-8" @@ -70,7 +70,7 @@ Content-Type: text/xml; charset="utf-8" user1 home - "a707eb83606863b8f1f30274b6b1a5b8" + "243d78db0cc75a576d2603eef69efdc9" #0252D4FF diff --git a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result index bab42055..a5f4e551 100644 --- a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result +++ b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result @@ -2,7 +2,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 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "2bac61d8cc65cae86757a7dd00eef4e2" +ETag: "4f2f5fe4966246175dfc7a90396422d2" Content-Length: 12754 Content-Type: text/xml; charset="utf-8" @@ -70,7 +70,7 @@ Content-Type: text/xml; charset="utf-8" user1 home - "a707eb83606863b8f1f30274b6b1a5b8" + "243d78db0cc75a576d2603eef69efdc9" #0252D4FF diff --git a/testing/tests/regression-suite/0555-iPhone-REPORT.result b/testing/tests/regression-suite/0555-iPhone-REPORT.result index 4719202e..0dad8ef7 100644 --- a/testing/tests/regression-suite/0555-iPhone-REPORT.result +++ b/testing/tests/regression-suite/0555-iPhone-REPORT.result @@ -2,8 +2,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 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "9c90079c6ad9a199bbf4a3b36eb92246" -Content-Length: 1123 +ETag: "64bfdf4e95a5799a86f1c79e0f3faf1d" +Content-Length: 1369 Content-Type: text/xml; charset="utf-8" @@ -48,4 +48,14 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/user1/home/0545-deflate-PUT.ics + + + "4a3aa58a3e11487e87d87024465d4182" + + + HTTP/1.1 200 OK + + diff --git a/testing/tests/regression-suite/0559-iOS-REPORT.result b/testing/tests/regression-suite/0559-iOS-REPORT.result index b102c654..ee3597d2 100644 --- a/testing/tests/regression-suite/0559-iOS-REPORT.result +++ b/testing/tests/regression-suite/0559-iOS-REPORT.result @@ -2,8 +2,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 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "8b72e0eb2a2a3afd42cf96e4df5e9974" -Content-Length: 950 +ETag: "09eb139019832f5f89469c914c977636" +Content-Length: 1227 Content-Type: text/xml; charset="utf-8" @@ -38,6 +38,16 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/user1/home/0545-deflate-PUT.ics + + + "4a3aa58a3e11487e87d87024465d4182" + text/calendar + + HTTP/1.1 200 OK + + dav_name: >/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics< @@ -60,3 +70,7 @@ Content-Type: text/xml; charset="utf-8" dtstart: >2011-10-05 14:00:00+13< rrule: >NULL< + dav_name: >/user1/home/0545-deflate-PUT.ics< + dtstart: >2011-10-07 10:00:00+13< + rrule: >NULL< + diff --git a/testing/tests/regression-suite/0598-REPORT-sync-initial.result b/testing/tests/regression-suite/0598-REPORT-sync-initial.result index 97c429a0..b34472f4 100644 --- a/testing/tests/regression-suite/0598-REPORT-sync-initial.result +++ b/testing/tests/regression-suite/0598-REPORT-sync-initial.result @@ -2,8 +2,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 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "f3c2aff3ffaca5f51dea5f2aa5eb194a" -Content-Length: 4253 +ETag: "f855e21bdab0b98d0bfefa0211bde9ac" +Content-Length: 4479 Content-Type: text/xml; charset="utf-8" @@ -161,5 +161,14 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/user1/home/0545-deflate-PUT.ics + + + "4a3aa58a3e11487e87d87024465d4182" + + HTTP/1.1 200 OK + + data:,2 diff --git a/testing/tests/regression-suite/0599-REPORT-sync-changed.result b/testing/tests/regression-suite/0599-REPORT-sync-changed.result index e2f739cf..745e0b76 100644 --- a/testing/tests/regression-suite/0599-REPORT-sync-changed.result +++ b/testing/tests/regression-suite/0599-REPORT-sync-changed.result @@ -2,8 +2,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 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "5b017196880ac06e0b2b5579ba6e5153" -Content-Length: 4009 +ETag: "99574d7bc8d5f12a1a5ac80934cee9f2" +Content-Length: 4235 Content-Type: text/xml; charset="utf-8" @@ -17,6 +17,15 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/user1/home/0545-deflate-PUT.ics + + + "4a3aa58a3e11487e87d87024465d4182" + + HTTP/1.1 200 OK + + /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics diff --git a/testing/tests/regression-suite/0602-Soho-PROPFIND.result b/testing/tests/regression-suite/0602-Soho-PROPFIND.result index 08e51f1f..67cddacc 100644 --- a/testing/tests/regression-suite/0602-Soho-PROPFIND.result +++ b/testing/tests/regression-suite/0602-Soho-PROPFIND.result @@ -2,8 +2,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 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "98b7c2157174c7fe61cb19bd4807456c" -Content-Length: 17006 +ETag: "b809f86b465fa4356c00d884de114029" +Content-Length: 17557 Content-Type: text/xml; charset="utf-8" @@ -426,6 +426,28 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 404 Not Found + + /caldav.php/user1/home/0545-deflate-PUT.ics + + + + /caldav.php/user1/ + + + mailto:user1@example.net + /caldav.php/user1/ + + + HTTP/1.1 200 OK + + + + + + + HTTP/1.1 404 Not Found + + /caldav.php/user1/addresses/ diff --git a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result index 2e450940..75174e7e 100644 --- a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result +++ b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.result @@ -633,6 +633,41 @@ HTTP/1.1 404 Not Found + + /caldav.php/user1/home/0545-deflate-PUT.ics + + + 20111004T023507Z + In Prague, 10am, Oct 7th for 1 hour + + 710 + text/calendar + "4a3aa58a3e11487e87d87024465d4182" + Dow, 01 Jan 2000 00:00:00 GMT + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + /caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics diff --git a/testing/tests/regression-suite/0901-GET-Collection.result b/testing/tests/regression-suite/0901-GET-Collection.result index 24ce380b..a4eef2bb 100644 --- a/testing/tests/regression-suite/0901-GET-Collection.result +++ b/testing/tests/regression-suite/0901-GET-Collection.result @@ -2,7 +2,7 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -Content-Length: 10461 +Content-Length: 11093 Etag: "855cbfab1940e342d7986c207bf3f973" Content-Type: text/calendar; charset="utf-8" @@ -234,6 +234,16 @@ DTSTAMP:20111004T153507Z SEQUENCE:1 END:VEVENT BEGIN:VEVENT +CREATED:20111004T153507Z +UID:0545-deflate-PUT +TRANSP:OPAQUE +SUMMARY:In Prague, 10am, Oct 7th for 1 hour +DTSTART;TZID=Prague_in_Central_Europe:20111007T100000 +DURATION:PT1H +DTSTAMP:20111004T153507Z +SEQUENCE:1 +END:VEVENT +BEGIN:VEVENT DESCRIPTION:Have a party. All the best parties are monthly! UID:DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74 DTSTAMP:20081024T220925Z @@ -377,4 +387,22 @@ TZNAME:GMT+01:00 TZOFFSETTO:+0100 END:STANDARD END:VTIMEZONE +BEGIN:VTIMEZONE +TZID:Prague_in_Central_Europe +X-MICROSOFT-CDO-TZID:4 +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/0902-PUT-collection.result b/testing/tests/regression-suite/0902-PUT-collection.result index bed510bd..09401b69 100644 --- a/testing/tests/regression-suite/0902-PUT-collection.result +++ b/testing/tests/regression-suite/0902-PUT-collection.result @@ -16,7 +16,7 @@ Content-Type: text/plain; charset="utf-8" attendees: >40< - collection_id: >1565< + collection_id: >1566< dav_displayname: >anotherone< dav_etag: >f9a8ee6b41d9b02aa5176e6da349121a< dav_name: >/user1/anotherone/< diff --git a/testing/tests/regression-suite/0924-MOVE.result b/testing/tests/regression-suite/0924-MOVE.result index 1cc2302d..2b977264 100644 --- a/testing/tests/regression-suite/0924-MOVE.result +++ b/testing/tests/regression-suite/0924-MOVE.result @@ -6,9 +6,9 @@ Content-Length: 0 Content-Type: text/plain; charset="utf-8" - cd_collection: >1565< + cd_collection: >1566< cd_user_no: >10< - ci_collection: >1565< + ci_collection: >1566< ci_user_no: >10< data_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< diff --git a/testing/tests/regression-suite/1100-REPORT-sync-changed.result b/testing/tests/regression-suite/1100-REPORT-sync-changed.result index 5cadb34e..e30ccc99 100644 --- a/testing/tests/regression-suite/1100-REPORT-sync-changed.result +++ b/testing/tests/regression-suite/1100-REPORT-sync-changed.result @@ -2,8 +2,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 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "9e36538f6420769c24958617f475b7a8" -Content-Length: 6171 +ETag: "6d416d900e71bc416b72a7f97e779ed3" +Content-Length: 6466 Content-Type: text/xml; charset="utf-8" @@ -18,6 +18,16 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/user1/home/0545-deflate-PUT.ics + + + "4a3aa58a3e11487e87d87024465d4182" + Dow, 01 Jan 2000 00:00:00 GMT + + HTTP/1.1 200 OK + + /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics diff --git a/testing/tests/scheduling/Restore-Database.result b/testing/tests/scheduling/Restore-Database.result index f64f5bae..90d7af1f 100644 --- a/testing/tests/scheduling/Restore-Database.result +++ b/testing/tests/scheduling/Restore-Database.result @@ -1,6 +1,6 @@ setval -------- - 1641 + 1642 (1 row) setval @@ -30,7 +30,7 @@ setval -------- - 12 + 13 (1 row) setval diff --git a/testing/tests/timezone/5010-list.result b/testing/tests/timezone/5010-list.result index c05b53ba..a2df3fe0 100644 --- a/testing/tests/timezone/5010-list.result +++ b/testing/tests/timezone/5010-list.result @@ -1,6 +1,6 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT -Content-Length: 2857 +Content-Length: 3064 Content-Type: application/xml; charset="utf-8" @@ -64,6 +64,13 @@ Content-Type: application/xml; charset="utf-8" Pacific/Auckland + + Prague_in_Central_Europe + all good + + + Prague_in_Central_Europe + /softwarestudio.org/Olson_20011030_5/Pacific/Auckland all good diff --git a/testing/tests/timezone/Restore-Database.result b/testing/tests/timezone/Restore-Database.result index 61b9de76..63cfba9b 100644 --- a/testing/tests/timezone/Restore-Database.result +++ b/testing/tests/timezone/Restore-Database.result @@ -1,6 +1,6 @@ setval -------- - 1651 + 1652 (1 row) setval @@ -30,7 +30,7 @@ setval -------- - 12 + 13 (1 row) setval