diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection.result b/testing/tests/regression-suite/000-Setup-PUT-collection.result index d967ced6..1098af46 100644 --- a/testing/tests/regression-suite/000-Setup-PUT-collection.result +++ b/testing/tests/regression-suite/000-Setup-PUT-collection.result @@ -50,7 +50,7 @@ END:VCALENDAR dtstart: >2008-10-20 11:00:00< due: >NULL< location: >NULL< - logged_user: >11< + logged_user: >1< percent_complete: >NULL< priority: >NULL< rrule: >FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR< @@ -105,7 +105,7 @@ END:VCALENDAR dtstart: >2008-10-20 09:00:00< due: >NULL< location: >NULL< - logged_user: >11< + logged_user: >1< percent_complete: >NULL< priority: >NULL< rrule: >FREQ=WEEKLY;INTERVAL=1< @@ -160,7 +160,7 @@ END:VCALENDAR dtstart: >2008-10-24 14:00:00< due: >NULL< location: >NULL< - logged_user: >11< + logged_user: >1< percent_complete: >NULL< priority: >NULL< rrule: >FREQ=WEEKLY;INTERVAL=1< diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection.test b/testing/tests/regression-suite/000-Setup-PUT-collection.test index 1fe1a715..c6200518 100644 --- a/testing/tests/regression-suite/000-Setup-PUT-collection.test +++ b/testing/tests/regression-suite/000-Setup-PUT-collection.test @@ -7,13 +7,14 @@ TYPE=PUT URL=http://mycaldav/caldav.php/user2/home/ HEADER=User-Agent: RSCDS Testing/0.7.x HEADER=Content-Type: text/calendar; charset=utf-8 -AUTH=user2:user2 +AUTH=admin:nimda HEAD BEGINDATA BEGIN:VCALENDAR PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN +X-WR-CALNAME:User 2's Calendar, as uploaded by Admin VERSION:2.0 BEGIN:VTIMEZONE TZID:Pacific/Auckland diff --git a/testing/tests/regression-suite/522-iCal-PROPFIND.result b/testing/tests/regression-suite/522-iCal-PROPFIND.result index 742b53af..09a525ed 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, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy -ETag: "723877d5d294d4b50951f599cb582d72" -Content-Length: 3870 +ETag: "3acbdbe8caf208d6c945526a7f69621b" +Content-Length: 3899 Content-Type: text/xml; charset="utf-8" @@ -37,7 +37,7 @@ Content-Type: text/xml; charset="utf-8" "876883ebf6e5e80fb501f490c70803b5" - user2 home + User 2's Calendar, as uploaded by Admin diff --git a/testing/tests/regression-suite/526-iCal-PROPFIND.result b/testing/tests/regression-suite/526-iCal-PROPFIND.result index 167f2892..033241a6 100644 --- a/testing/tests/regression-suite/526-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/526-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, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy -ETag: "a5e9b2d6ceab834c384219859234d38c" +ETag: "fc0f5539296edf051d8a53d6a2bfe8cc" Content-Length: 764 Content-Type: text/xml; charset="utf-8" @@ -12,11 +12,11 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/manager1/ - /caldav.php/resource1/ /caldav.php/assistant1/ - /caldav.php/resource2/ + /caldav.php/manager1/ /caldav.php/resmgr1/ + /caldav.php/resource1/ + /caldav.php/resource2/ /caldav.php/teamclient1/ /caldav.php/manager1/calendar-proxy-read/ /caldav.php/assistant1/calendar-proxy-read/ diff --git a/testing/tests/regression-suite/599-REPORT-sync-changed.result b/testing/tests/regression-suite/599-REPORT-sync-changed.result index 04f090c1..487443e4 100644 --- a/testing/tests/regression-suite/599-REPORT-sync-changed.result +++ b/testing/tests/regression-suite/599-REPORT-sync-changed.result @@ -1,38 +1,18 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy -ETag: "d179d0a8f803746e3e788ffdc7f98c3a" +ETag: "a3009bc4863f7b991b1fa62e8e2816e4" Content-Length: 4530 Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/20061101T073004Z.ics + /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics HTTP/1.1 201 Created - "c3658901fd4689d4a1e1d6f08601ef4f" - - HTTP/1.1 200 OK - - - - /caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics - HTTP/1.1 201 Created - - - "a1c6404d61190f9574e2bfd69383f144" - - HTTP/1.1 200 OK - - - - /caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics - HTTP/1.1 201 Created - - - "08a435c2abaf38f4a50a997343c098a7" + "00ad5eb1eb5507884710b0b66aa5d5c4" HTTP/1.1 200 OK @@ -48,11 +28,11 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics + /caldav.php/user1/home/20061101T073004Z.ics HTTP/1.1 201 Created - "ac90acd649c25070b1a2a17fb31a105a" + "c3658901fd4689d4a1e1d6f08601ef4f" HTTP/1.1 200 OK @@ -68,51 +48,21 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics + /caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics HTTP/1.1 201 Created - "cb3d9dc3e8c157f53eba3ea0e1e0f146" + "a1c6404d61190f9574e2bfd69383f144" HTTP/1.1 200 OK - /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics + /caldav.php/user1/home/70D23799-4A68-4905-AB9F-4D47BA693CFD.ics HTTP/1.1 201 Created - "00ad5eb1eb5507884710b0b66aa5d5c4" - - HTTP/1.1 200 OK - - - - /caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics - HTTP/1.1 201 Created - - - "a2990674708634a311bb98a59865ca50" - - HTTP/1.1 200 OK - - - - /caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics - HTTP/1.1 201 Created - - - "e8060931f30c1798ac58ffbe4ec0bffc" - - HTTP/1.1 200 OK - - - - /caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics - HTTP/1.1 201 Created - - - "8f581a053df6d833254756dfd7553d37" + "257b9df4aaf573a578af4aadd033abf4" HTTP/1.1 200 OK @@ -128,11 +78,21 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics + /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics HTTP/1.1 201 Created - "421abf7e4848d2fecbf64217ed205d4b" + "cb3d9dc3e8c157f53eba3ea0e1e0f146" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics + HTTP/1.1 201 Created + + + "08a435c2abaf38f4a50a997343c098a7" HTTP/1.1 200 OK @@ -148,11 +108,51 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/70D23799-4A68-4905-AB9F-4D47BA693CFD.ics + /caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics HTTP/1.1 201 Created - "257b9df4aaf573a578af4aadd033abf4" + "a2990674708634a311bb98a59865ca50" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics + HTTP/1.1 201 Created + + + "421abf7e4848d2fecbf64217ed205d4b" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics + HTTP/1.1 201 Created + + + "8f581a053df6d833254756dfd7553d37" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics + HTTP/1.1 201 Created + + + "e8060931f30c1798ac58ffbe4ec0bffc" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics + HTTP/1.1 201 Created + + + "ac90acd649c25070b1a2a17fb31a105a" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/831-Spec-RRULE-1.result b/testing/tests/regression-suite/831-Spec-RRULE-1.result index 5fd55a34..1ec7b646 100644 --- a/testing/tests/regression-suite/831-Spec-RRULE-1.result +++ b/testing/tests/regression-suite/831-Spec-RRULE-1.result @@ -1,183 +1,73 @@ 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 -Transfer-Encoding: chunked -Content-Type: text/plain +Content-Length: 5540 +Content-Type: text/html -Testing the RRule Library +#!/usr/bin/php + +Warning: Cannot modify header information - headers already sent by (output started at /home/andrew/projects/davical/testing/test-RRULE-v2.php:2) in /home/andrew/projects/davical/testing/test-RRULE-v2.php on line 15 +Testing the RRule v2 Library =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061103T073000 - RRULE:FREQ=DAILY;COUNT=7 Daily for 7 days -PHP Result: - - 2006-11-03 07:30:00 2006-11-04 07:30:00 2006-11-05 07:30:00 2006-11-06 07:30:00 - 2006-11-07 07:30:00 2006-11-08 07:30:00 2006-11-09 07:30:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061102T100000 - RRULE:FREQ=WEEKLY;COUNT=26;INTERVAL=1;BYDAY=TH Weekly for 26 weeks -PHP Result: - - 2006-11-02 10:00:00 2006-11-09 10:00:00 2006-11-16 10:00:00 2006-11-23 10:00:00 - 2006-11-30 10:00:00 2006-12-07 10:00:00 2006-12-14 10:00:00 2006-12-21 10:00:00 - 2006-12-28 10:00:00 2007-01-04 10:00:00 2007-01-11 10:00:00 2007-01-18 10:00:00 - 2007-01-25 10:00:00 2007-02-01 10:00:00 2007-02-08 10:00:00 2007-02-15 10:00:00 - 2007-02-22 10:00:00 2007-03-01 10:00:00 2007-03-08 10:00:00 2007-03-15 10:00:00 - 2007-03-22 10:00:00 2007-03-29 10:00:00 2007-04-05 10:00:00 2007-04-12 10:00:00 - 2007-04-19 10:00:00 2007-04-26 10:00:00 - +PHP & SQL results are identical (-: +=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= +20061103T160000 - RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=4 +Fortnightly for 4 events +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061103T160000 - RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=20071122T235900 Fortnightly for 28 events -PHP Result: - - 2006-11-03 16:00:00 2006-11-17 16:00:00 2006-12-01 16:00:00 2006-12-15 16:00:00 - 2006-12-29 16:00:00 2007-01-12 16:00:00 2007-01-26 16:00:00 2007-02-09 16:00:00 - 2007-02-23 16:00:00 2007-03-09 16:00:00 2007-03-23 16:00:00 2007-04-06 16:00:00 - 2007-04-20 16:00:00 2007-05-04 16:00:00 2007-05-18 16:00:00 2007-06-01 16:00:00 - 2007-06-15 16:00:00 2007-06-29 16:00:00 2007-07-13 16:00:00 2007-07-27 16:00:00 - 2007-08-10 16:00:00 2007-08-24 16:00:00 2007-09-07 16:00:00 2007-09-21 16:00:00 - 2007-10-05 16:00:00 2007-10-19 16:00:00 2007-11-02 16:00:00 2007-11-16 16:00:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20081101T160000 - RRULE:FREQ=WEEKLY;COUNT=15;INTERVAL=1;BYDAY=MO,WE,FR 3/wk for 5 weeks -PHP Result: - - 2008-11-03 16:00:00 2008-11-05 16:00:00 2008-11-07 16:00:00 2008-11-10 16:00:00 - 2008-11-12 16:00:00 2008-11-14 16:00:00 2008-11-17 16:00:00 2008-11-19 16:00:00 - 2008-11-21 16:00:00 2008-11-24 16:00:00 2008-11-26 16:00:00 2008-11-28 16:00:00 - 2008-12-01 16:00:00 2008-12-03 16:00:00 2008-12-05 16:00:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061104T073000 - RRULE:FREQ=MONTHLY Monthly forever -PHP Result: - - 2006-11-04 07:30:00 2006-12-04 07:30:00 2007-01-04 07:30:00 2007-02-04 07:30:00 - 2007-03-04 07:30:00 2007-04-04 07:30:00 2007-05-04 07:30:00 2007-06-04 07:30:00 - 2007-07-04 07:30:00 2007-08-04 07:30:00 2007-09-04 07:30:00 2007-10-04 07:30:00 - 2007-11-04 07:30:00 2007-12-04 07:30:00 2008-01-04 07:30:00 2008-02-04 07:30:00 - 2008-03-04 07:30:00 2008-04-04 07:30:00 2008-05-04 07:30:00 2008-06-04 07:30:00 - 2008-07-04 07:30:00 2008-08-04 07:30:00 2008-09-04 07:30:00 2008-10-04 07:30:00 - 2008-11-04 07:30:00 2008-12-04 07:30:00 2009-01-04 07:30:00 2009-02-04 07:30:00 - 2009-03-04 07:30:00 2009-04-04 07:30:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061117T073000 - RRULE:FREQ=MONTHLY;BYDAY=1MO,2WE,3FR,-1SU Monthly, on the 1st monday, 2nd wednesday, 3rd friday and last sunday, forever -PHP Result: - - 2006-11-17 07:30:00 2006-11-26 07:30:00 2006-12-04 07:30:00 2006-12-13 07:30:00 - 2006-12-15 07:30:00 2006-12-31 07:30:00 2007-01-01 07:30:00 2007-01-10 07:30:00 - 2007-01-19 07:30:00 2007-01-28 07:30:00 2007-02-05 07:30:00 2007-02-14 07:30:00 - 2007-02-16 07:30:00 2007-02-25 07:30:00 2007-03-05 07:30:00 2007-03-14 07:30:00 - 2007-03-16 07:30:00 2007-03-25 07:30:00 2007-04-02 07:30:00 2007-04-11 07:30:00 - 2007-04-20 07:30:00 2007-04-29 07:30:00 2007-05-07 07:30:00 2007-05-09 07:30:00 - 2007-05-18 07:30:00 2007-05-27 07:30:00 2007-06-04 07:30:00 2007-06-13 07:30:00 - 2007-06-15 07:30:00 2007-06-24 07:30:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= -20061107T113000 - RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1 +20061107T113000 - RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;UNTIL=20070101T000000 +The working days of each month +PHP & SQL results are identical (-: +=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= +20061107T113000 - RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1;COUNT=30 The last working day of each month -PHP Result: - - 2006-11-30 11:30:00 2006-12-29 11:30:00 2007-01-31 11:30:00 2007-02-28 11:30:00 - 2007-03-30 11:30:00 2007-04-30 11:30:00 2007-05-31 11:30:00 2007-06-29 11:30:00 - 2007-07-31 11:30:00 2007-08-31 11:30:00 2007-09-28 11:30:00 2007-10-31 11:30:00 - 2007-11-30 11:30:00 2007-12-31 11:30:00 2008-01-31 11:30:00 2008-02-29 11:30:00 - 2008-03-31 11:30:00 2008-04-30 11:30:00 2008-05-30 11:30:00 2008-06-30 11:30:00 - 2008-07-31 11:30:00 2008-08-29 11:30:00 2008-09-30 11:30:00 2008-10-31 11:30:00 - 2008-11-28 11:30:00 2008-12-31 11:30:00 2009-01-30 11:30:00 2009-02-27 11:30:00 - 2009-03-31 11:30:00 2009-04-30 11:30:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= -20081020T103000 - RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR +20081020T103000 - RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;COUNT=30 Every working day -PHP Result: - - 2008-10-20 10:30:00 2008-10-21 10:30:00 2008-10-22 10:30:00 2008-10-23 10:30:00 - 2008-10-24 10:30:00 2008-10-27 10:30:00 2008-10-28 10:30:00 2008-10-29 10:30:00 - 2008-10-30 10:30:00 2008-10-31 10:30:00 2008-11-03 10:30:00 2008-11-04 10:30:00 - 2008-11-05 10:30:00 2008-11-06 10:30:00 2008-11-07 10:30:00 2008-11-10 10:30:00 - 2008-11-11 10:30:00 2008-11-12 10:30:00 2008-11-13 10:30:00 2008-11-14 10:30:00 - 2008-11-17 10:30:00 2008-11-18 10:30:00 2008-11-19 10:30:00 2008-11-20 10:30:00 - 2008-11-21 10:30:00 2008-11-24 10:30:00 2008-11-25 10:30:00 2008-11-26 10:30:00 - 2008-11-27 10:30:00 2008-11-28 10:30:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= -20081020T110000 - RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR +20081020T110000 - RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR;COUNT=30 Every working day -PHP Result: - - 2008-10-20 11:00:00 2008-10-21 11:00:00 2008-10-22 11:00:00 2008-10-23 11:00:00 - 2008-10-24 11:00:00 2008-10-27 11:00:00 2008-10-28 11:00:00 2008-10-29 11:00:00 - 2008-10-30 11:00:00 2008-10-31 11:00:00 2008-11-03 11:00:00 2008-11-04 11:00:00 - 2008-11-05 11:00:00 2008-11-06 11:00:00 2008-11-07 11:00:00 2008-11-10 11:00:00 - 2008-11-11 11:00:00 2008-11-12 11:00:00 2008-11-13 11:00:00 2008-11-14 11:00:00 - 2008-11-17 11:00:00 2008-11-18 11:00:00 2008-11-19 11:00:00 2008-11-20 11:00:00 - 2008-11-21 11:00:00 2008-11-24 11:00:00 2008-11-25 11:00:00 2008-11-26 11:00:00 - 2008-11-27 11:00:00 2008-11-28 11:00:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= -20081001T133000 - RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=1TU,2WE,3TH,4FR;BYMONTH=3,6,9,10,12 -1st Tuesday, 2nd Wednesday, 3rd Thursday & 4th Friday, every March, June, September, October and December -PHP Result: - - 2008-10-07 13:30:00 2008-10-08 13:30:00 2008-10-16 13:30:00 2008-10-24 13:30:00 - 2008-12-02 13:30:00 2008-12-10 13:30:00 2008-12-18 13:30:00 2008-12-26 13:30:00 - 2009-03-03 13:30:00 2009-03-11 13:30:00 2009-03-19 13:30:00 2009-03-27 13:30:00 - 2009-06-02 13:30:00 2009-06-10 13:30:00 2009-06-18 13:30:00 2009-06-26 13:30:00 - 2009-09-01 13:30:00 2009-09-09 13:30:00 2009-09-17 13:30:00 2009-09-25 13:30:00 - 2009-10-06 13:30:00 2009-10-14 13:30:00 2009-10-15 13:30:00 2009-10-23 13:30:00 - 2009-12-01 13:30:00 2009-12-09 13:30:00 2009-12-17 13:30:00 2009-12-25 13:30:00 - 2010-03-02 13:30:00 2010-03-10 13:30:00 - -=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= -20081017T084500 - RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=TU,FR +20081017T084500 - RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=TU,FR;COUNT=30 Every tuesday and friday -PHP Result: - - 2008-10-17 08:45:00 2008-10-21 08:45:00 2008-10-24 08:45:00 2008-10-28 08:45:00 - 2008-10-31 08:45:00 2008-11-04 08:45:00 2008-11-07 08:45:00 2008-11-11 08:45:00 - 2008-11-14 08:45:00 2008-11-18 08:45:00 2008-11-21 08:45:00 2008-11-25 08:45:00 - 2008-11-28 08:45:00 2008-12-02 08:45:00 2008-12-05 08:45:00 2008-12-09 08:45:00 - 2008-12-12 08:45:00 2008-12-16 08:45:00 2008-12-19 08:45:00 2008-12-23 08:45:00 - 2008-12-26 08:45:00 2008-12-30 08:45:00 2009-01-02 08:45:00 2009-01-06 08:45:00 - 2009-01-09 08:45:00 2009-01-13 08:45:00 2009-01-16 08:45:00 2009-01-20 08:45:00 - 2009-01-23 08:45:00 2009-01-27 08:45:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= -20081017T084500 - RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,FR +20081017T084500 - RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,FR;COUNT=30 Every tuesday and friday -PHP Result: - - 2008-10-17 08:45:00 2008-10-21 08:45:00 2008-10-24 08:45:00 2008-10-28 08:45:00 - 2008-10-31 08:45:00 2008-11-04 08:45:00 2008-11-07 08:45:00 2008-11-11 08:45:00 - 2008-11-14 08:45:00 2008-11-18 08:45:00 2008-11-21 08:45:00 2008-11-25 08:45:00 - 2008-11-28 08:45:00 2008-12-02 08:45:00 2008-12-05 08:45:00 2008-12-09 08:45:00 - 2008-12-12 08:45:00 2008-12-16 08:45:00 2008-12-19 08:45:00 2008-12-23 08:45:00 - 2008-12-26 08:45:00 2008-12-30 08:45:00 2009-01-02 08:45:00 2009-01-06 08:45:00 - 2009-01-09 08:45:00 2009-01-13 08:45:00 2009-01-16 08:45:00 2009-01-20 08:45:00 - 2009-01-23 08:45:00 2009-01-27 08:45:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= -20081017T084500 - RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=TU,FR +20081017T084500 - RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=TU,FR;COUNT=30 Every tuesday and friday -PHP Result: - - 2008-10-17 08:45:00 2008-10-21 08:45:00 2008-10-24 08:45:00 2008-10-28 08:45:00 - 2008-10-31 08:45:00 2008-11-04 08:45:00 2008-11-07 08:45:00 2008-11-11 08:45:00 - 2008-11-14 08:45:00 2008-11-18 08:45:00 2008-11-21 08:45:00 2008-11-25 08:45:00 - 2008-11-28 08:45:00 2008-12-02 08:45:00 2008-12-05 08:45:00 2008-12-09 08:45:00 - 2008-12-12 08:45:00 2008-12-16 08:45:00 2008-12-19 08:45:00 2008-12-23 08:45:00 - 2008-12-26 08:45:00 2008-12-30 08:45:00 2009-01-02 08:45:00 2009-01-06 08:45:00 - 2009-01-09 08:45:00 2009-01-13 08:45:00 2009-01-16 08:45:00 2009-01-20 08:45:00 - 2009-01-23 08:45:00 2009-01-27 08:45:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 19700315T030000 - FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3 Time zone 1 +PHP & SQL results differ :-( PHP Result: 1970-03-15 03:00:00 1971-03-21 03:00:00 1972-03-19 03:00:00 1973-03-18 03:00:00 @@ -189,45 +79,26 @@ PHP Result: 1994-03-20 03:00:00 1995-03-19 03:00:00 1996-03-17 03:00:00 1997-03-16 03:00:00 1998-03-15 03:00:00 1999-03-21 03:00:00 +SQL Result: + + 1970-03-15 03:00:00 1971-03-21 03:00:00 1972-03-19 03:00:00 1973-03-18 03:00:00 + 1974-03-17 03:00:00 1975-03-16 03:00:00 1976-03-21 03:00:00 1977-03-20 03:00:00 + 1978-03-19 03:00:00 1979-03-18 03:00:00 1980-03-16 03:00:00 1981-03-15 03:00:00 + 1982-03-21 03:00:00 1983-03-20 03:00:00 1984-03-18 03:00:00 1985-03-17 03:00:00 + 1986-03-16 03:00:00 1987-03-15 03:00:00 1988-03-20 03:00:00 1989-03-19 03:00:00 + 1990-03-18 02:00:00 1991-03-17 02:00:00 1992-03-15 02:00:00 1993-03-21 02:00:00 + 1994-03-20 02:00:00 1995-03-19 02:00:00 1996-03-17 02:00:00 1997-03-16 02:00:00 + 1998-03-15 02:00:00 1999-03-21 02:00:00 + =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 19700927T020000 - FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=9 Time zone 2 -PHP Result: - - 1970-09-27 02:00:00 1971-09-26 02:00:00 1972-09-24 02:00:00 1973-09-30 02:00:00 - 1974-09-29 02:00:00 1975-09-28 02:00:00 1976-09-26 02:00:00 1977-09-25 02:00:00 - 1978-09-24 02:00:00 1979-09-30 02:00:00 1980-09-28 02:00:00 1981-09-27 02:00:00 - 1982-09-26 02:00:00 1983-09-25 02:00:00 1984-09-30 02:00:00 1985-09-29 02:00:00 - 1986-09-28 02:00:00 1987-09-27 02:00:00 1988-09-25 02:00:00 1989-09-24 02:00:00 - 1990-09-30 02:00:00 1991-09-29 02:00:00 1992-09-27 02:00:00 1993-09-26 02:00:00 - 1994-09-25 02:00:00 1995-09-24 02:00:00 1996-09-29 02:00:00 1997-09-28 02:00:00 - 1998-09-27 02:00:00 1999-09-26 02:00:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 19810329T030000 - FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU Time zone 3 -PHP Result: - - 1981-03-29 03:00:00 1982-03-28 03:00:00 1983-03-27 03:00:00 1984-03-25 03:00:00 - 1985-03-31 03:00:00 1986-03-30 03:00:00 1987-03-29 03:00:00 1988-03-27 03:00:00 - 1989-03-26 03:00:00 1990-03-25 03:00:00 1991-03-31 03:00:00 1992-03-29 03:00:00 - 1993-03-28 03:00:00 1994-03-27 03:00:00 1995-03-26 03:00:00 1996-03-31 03:00:00 - 1997-03-30 03:00:00 1998-03-29 03:00:00 1999-03-28 03:00:00 2000-03-26 03:00:00 - 2001-03-25 03:00:00 2002-03-31 03:00:00 2003-03-30 03:00:00 2004-03-28 03:00:00 - 2005-03-27 03:00:00 2006-03-26 03:00:00 2007-03-25 03:00:00 2008-03-30 03:00:00 - 2009-03-29 03:00:00 2010-03-28 03:00:00 - +PHP & SQL results are identical (-: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= -20000404T020000 - FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +20000404T010000 - FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;COUNT=15 Time zone 4 -PHP Result: - - 2001-04-01 02:00:00 2002-04-07 02:00:00 2003-04-06 02:00:00 2004-04-04 02:00:00 - 2005-04-03 02:00:00 2006-04-02 02:00:00 2007-04-01 02:00:00 2008-04-06 02:00:00 - 2009-04-05 02:00:00 2010-04-04 02:00:00 2011-04-03 02:00:00 2012-04-01 02:00:00 - 2013-04-07 02:00:00 2014-04-06 02:00:00 2015-04-05 02:00:00 2016-04-03 02:00:00 - 2017-04-02 02:00:00 2018-04-01 02:00:00 2019-04-07 02:00:00 2020-04-05 02:00:00 - 2021-04-04 02:00:00 2022-04-03 02:00:00 2023-04-02 02:00:00 2024-04-07 02:00:00 - 2025-04-06 02:00:00 2026-04-05 02:00:00 2027-04-04 02:00:00 2028-04-02 02:00:00 - 2029-04-01 02:00:00 2030-04-07 02:00:00 - +PHP & SQL results are identical (-: diff --git a/testing/tests/regression-suite/831-Spec-RRULE-1.test b/testing/tests/regression-suite/831-Spec-RRULE-1.test index a3499120..aa68abda 100644 --- a/testing/tests/regression-suite/831-Spec-RRULE-1.test +++ b/testing/tests/regression-suite/831-Spec-RRULE-1.test @@ -11,3 +11,5 @@ HEAD # This is a special type of request which just calls a PHP # program specifically for exercising the RRULE library. # + +REPLACE=/P: 0\.\d{4} & S: 0\.\d{4}// diff --git a/testing/tests/regression-suite/862-Spec-REPORT-principal.result b/testing/tests/regression-suite/862-Spec-REPORT-principal.result index a3c3110d..18d97c0d 100644 --- a/testing/tests/regression-suite/862-Spec-REPORT-principal.result +++ b/testing/tests/regression-suite/862-Spec-REPORT-principal.result @@ -1,7 +1,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy -ETag: "d7563f78faaadf67e4dbde9fc2ada5a7" +ETag: "0f4b3456426720dea03e25482da4057d" Content-Length: 1226 Content-Type: text/xml; charset="utf-8" @@ -24,11 +24,11 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/manager1/ - /caldav.php/resource1/ /caldav.php/assistant1/ - /caldav.php/resource2/ + /caldav.php/manager1/ /caldav.php/resmgr1/ + /caldav.php/resource1/ + /caldav.php/resource2/ /caldav.php/teamclient1/ /caldav.php/manager1/calendar-proxy-read/ /caldav.php/assistant1/calendar-proxy-read/ diff --git a/testing/tests/regression-suite/871-PROPFIND.result b/testing/tests/regression-suite/871-PROPFIND.result index 20ac5287..8de01ea3 100644 --- a/testing/tests/regression-suite/871-PROPFIND.result +++ b/testing/tests/regression-suite/871-PROPFIND.result @@ -1,8 +1,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy -ETag: "33402f04be15edd115f5a535524b92ef" -Content-Length: 493 +ETag: "7a7d941438d54843b6b5d9beb9d2a9a4" +Content-Length: 522 Content-Type: text/xml; charset="utf-8" @@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user2/home/ - user2 home + User 2's Calendar, as uploaded by Admin "876883ebf6e5e80fb501f490c70803b5" diff --git a/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result b/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result index 6362278a..2442ebb7 100644 --- a/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result +++ b/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result @@ -1,7 +1,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy -ETag: "31ce8bd9c40357ae067a52cf8c75cadc" +ETag: "fc63ca0d363b588cc41c31aea73f4518" Content-Length: 8564 Content-Type: text/xml; charset="utf-8" @@ -116,7 +116,7 @@ Content-Type: text/xml; charset="utf-8" - 89514106d00f37cc9ee71689c450d2ef + fcd66a046424de224fa18618b49e0d89 HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/930-REPORT-expand-property.result b/testing/tests/regression-suite/930-REPORT-expand-property.result index 981b9c92..b4224cd2 100644 --- a/testing/tests/regression-suite/930-REPORT-expand-property.result +++ b/testing/tests/regression-suite/930-REPORT-expand-property.result @@ -1,7 +1,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy -ETag: "fcb2b06e2039d4cfe89b55caeb0098ef" +ETag: "3fc7af8b9dcea1aa7ead9fa8cfeb7efd" Content-Length: 3601 Content-Type: text/xml; charset="utf-8" @@ -12,6 +12,19 @@ Content-Type: text/xml; charset="utf-8" + + /caldav.php/assistant1/ + + + httpd/unix-directory + + + + + + HTTP/1.1 200 OK + + /caldav.php/manager1/ @@ -25,6 +38,19 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/resmgr1/ + + + httpd/unix-directory + + + + + + HTTP/1.1 200 OK + + /caldav.php/resource1/ @@ -38,19 +64,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/assistant1/ - - - httpd/unix-directory - - - - - - HTTP/1.1 200 OK - - /caldav.php/resource2/ @@ -64,19 +77,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/resmgr1/ - - - httpd/unix-directory - - - - - - HTTP/1.1 200 OK - - /caldav.php/teamclient1/ diff --git a/testing/tests/regression-suite/931-REPORT-expand-property.result b/testing/tests/regression-suite/931-REPORT-expand-property.result index c902737c..ed61e42a 100644 --- a/testing/tests/regression-suite/931-REPORT-expand-property.result +++ b/testing/tests/regression-suite/931-REPORT-expand-property.result @@ -1,7 +1,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy -ETag: "8ce7facb0ad078e6ae7e49d14209f922" +ETag: "0d81b1b934eb738f04a8d9aee626b2f4" Content-Length: 3759 Content-Type: text/xml; charset="utf-8" @@ -12,6 +12,18 @@ Content-Type: text/xml; charset="utf-8" + + /caldav.php/assistant1/ + + + Assistant 1 + + /caldav.php/assistant1/ + + + HTTP/1.1 200 OK + + /caldav.php/manager1/ @@ -24,6 +36,18 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/resmgr1/ + + + Resource Managers + + /caldav.php/resmgr1/ + + + HTTP/1.1 200 OK + + /caldav.php/resource1/ @@ -36,18 +60,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/assistant1/ - - - Assistant 1 - - /caldav.php/assistant1/ - - - HTTP/1.1 200 OK - - /caldav.php/resource2/ @@ -60,18 +72,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/resmgr1/ - - - Resource Managers - - /caldav.php/resmgr1/ - - - HTTP/1.1 200 OK - - /caldav.php/teamclient1/