From 4a9190462ce83e8df39315262b95a71a6d21fa41 Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Sun, 19 Sep 2021 02:08:33 +1200 Subject: [PATCH] Fix regression tests following Piotr's fix in 467a6bf8900bd0c37f30e74b4adeb6ef801d4eb5 --- ChangeLog | 3 +++ testing/tests/regression-suite/0889-POST-freebusy.result | 1 - .../regression-suite/2201-RFC5545-Duration-FreeBusy.result | 3 +-- .../tests/regression-suite/2201-RFC5545-Duration-FreeBusy.test | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c6aefbc..b161d8bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2021-09-18 Andrew Ruthven * Don't try and use get_magic_quotes_gpc or get_magic_quotes_runtime on PHP 8 or newer. + * Correctly calculate the duration for zero time events (DTSTART = DTEND) and + therefore don't show them in Free/Busy (previously they were show has taking + 24 hours). Thank you Piotr Filip for the patch! 2021-03-01 Florian Schlichting * release davical 1.1.10 diff --git a/testing/tests/regression-suite/0889-POST-freebusy.result b/testing/tests/regression-suite/0889-POST-freebusy.result index 2b0d245d..3c179eab 100644 --- a/testing/tests/regression-suite/0889-POST-freebusy.result +++ b/testing/tests/regression-suite/0889-POST-freebusy.result @@ -808,7 +808,6 @@ FREEBUSY:20071206T180000Z/20071207T040000Z FREEBUSY:20071206T220000Z/20071206T230000Z FREEBUSY:20071207T220000Z/20071207T230000Z FREEBUSY:20071208T220000Z/20071208T230000Z -FREEBUSY:20071209T003000Z/20071210T003000Z FREEBUSY:20071209T180000Z/20071210T040000Z FREEBUSY:20071209T220000Z/20071209T230000Z FREEBUSY:20071210T180000Z/20071211T040000Z diff --git a/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.result b/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.result index 6d46d073..142cbc1b 100644 --- a/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.result +++ b/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.result @@ -1,6 +1,6 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT -Content-Length: 310 +Content-Length: 266 Content-Type: text/calendar;charset=UTF-8 BEGIN:VCALENDAR @@ -11,7 +11,6 @@ BEGIN:VFREEBUSY DTSTAMP:yyyymmddThhmmssZ DTSTART:correct DTEND:correct -FREEBUSY:20210918T133000Z/20210918T133000Z FREEBUSY:20210920T194500Z/20210920T203000Z END:VFREEBUSY END:VCALENDAR diff --git a/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.test b/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.test index bed6d967..f3abc711 100644 --- a/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.test +++ b/testing/tests/regression-suite/2201-RFC5545-Duration-FreeBusy.test @@ -2,6 +2,8 @@ # Request a freebusy report by URL # # The event that we care about has DTSTART of 20210918T133000Z. +# And zero length events don't appear in Free/Busy, therefore this +# event will appear in the SQL result, but not the freebusy.php result. # TYPE=GET URL=http://regression.host/freebusy.php/user1/home/?start=20210918T000000&period=P3D