From 0e214c4932d31c7a2ecb0ff4bd602043e725c60d Mon Sep 17 00:00:00 2001 From: "Eduardo S. Libardi" Date: Mon, 28 Nov 2016 23:43:53 -0200 Subject: [PATCH] res_calendar_caldav: Add support reading gmail calendar The response from gmail calendar includes the string name "caldav:calendar-data". res_calendar_caldav implements the example included in RFC 4791: string "C:calendar-data". When reading the calendar, res_calendar_caldav compare the string and if does not match just discards the event. This commit compares the response to both strings, successfully loading gmail calendar events. Writing to gmail calendar is working prior to this fix. ASTERISK-26624 Reported by: Eduardo S. Libardi Change-Id: Ia1eef10552ae616efb645d390f5ffe81260d7d4a --- res/res_calendar_caldav.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c index 11650375bd..8a603cf47a 100644 --- a/res/res_calendar_caldav.c +++ b/res/res_calendar_caldav.c @@ -480,7 +480,7 @@ static void handle_start_element(void *data, const xmlChar *fullname, const xmlC { struct xmlstate *state = data; - if (!xmlStrcasecmp(fullname, BAD_CAST "C:calendar-data")) { + if (!xmlStrcasecmp(fullname, BAD_CAST "C:calendar-data") || !xmlStrcasecmp(fullname, BAD_CAST "caldav:calendar-data")) { state->in_caldata = 1; ast_str_reset(state->cdata); } @@ -494,7 +494,7 @@ static void handle_end_element(void *data, const xmlChar *name) icalcomponent *iter; icalcomponent *comp; - if (xmlStrcasecmp(name, BAD_CAST "C:calendar-data")) { + if (xmlStrcasecmp(name, BAD_CAST "C:calendar-data") && xmlStrcasecmp(name, BAD_CAST "caldav:calendar-data")) { return; }