From 39f9ac1ceaf2dd2208e811173e739f1695926732 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Tue, 22 Feb 2011 15:42:35 +1300 Subject: [PATCH] Force line endings to consistent CRLF in GET. Signed-off-by: Andrew McMillan --- .../regression-suite/0103-Evo-GET-1.result | 68 +++++++-------- .../regression-suite/0106-Evo-GET-1.result | 82 +++++++++---------- .../0402-Cadaver-GET-1.result | 80 +++++++++--------- 3 files changed, 115 insertions(+), 115 deletions(-) diff --git a/testing/tests/regression-suite/0103-Evo-GET-1.result b/testing/tests/regression-suite/0103-Evo-GET-1.result index 168ec1d1..b231071c 100644 --- a/testing/tests/regression-suite/0103-Evo-GET-1.result +++ b/testing/tests/regression-suite/0103-Evo-GET-1.result @@ -3,39 +3,39 @@ 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 Etag: "2c32a2f8aba853654eb17fe037a4db4d" -Content-Length: 747 +Content-Length: 780 Content-Type: text/calendar; charset="utf-8" -BEGIN:VCALENDAR -CALSCALE:GREGORIAN -PRODID:-//mulberrymail.com//Mulberry v4.0//EN -VERSION:2.0 -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: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 -END:VCALENDAR +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//mulberrymail.com//Mulberry v4.0//EN +VERSION:2.0 +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: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 +END:VCALENDAR diff --git a/testing/tests/regression-suite/0106-Evo-GET-1.result b/testing/tests/regression-suite/0106-Evo-GET-1.result index df60b470..335fe5b0 100644 --- a/testing/tests/regression-suite/0106-Evo-GET-1.result +++ b/testing/tests/regression-suite/0106-Evo-GET-1.result @@ -3,46 +3,46 @@ 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 Etag: "c3658901fd4689d4a1e1d6f08601ef4f" -Content-Length: 1059 +Content-Length: 1099 Content-Type: text/calendar; charset="utf-8" -BEGIN:VCALENDAR -CALSCALE:GREGORIAN -PRODID:-//Ximian//NONSGML Evolution Calendar//EN -VERSION:2.0 -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: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 -END:VCALENDAR +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Ximian//NONSGML Evolution Calendar//EN +VERSION:2.0 +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: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 +END:VCALENDAR diff --git a/testing/tests/regression-suite/0402-Cadaver-GET-1.result b/testing/tests/regression-suite/0402-Cadaver-GET-1.result index 21b884cb..35214626 100644 --- a/testing/tests/regression-suite/0402-Cadaver-GET-1.result +++ b/testing/tests/regression-suite/0402-Cadaver-GET-1.result @@ -1,40 +1,40 @@ -BEGIN:VCALENDAR -CALSCALE:GREGORIAN -PRODID:-//Ximian//NONSGML Evolution Calendar//EN -VERSION:2.0 -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: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 -END:VCALENDAR +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Ximian//NONSGML Evolution Calendar//EN +VERSION:2.0 +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: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 +END:VCALENDAR