From 288a88239b16567935e09a033af64720ba52648d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 3 Oct 2011 15:48:24 +0000 Subject: [PATCH] we should not return an etag here, as we never store the PUT ical byte-by-byte --- addressbook/inc/class.addressbook_groupdav.inc.php | 3 ++- calendar/inc/class.calendar_groupdav.inc.php | 3 ++- infolog/inc/class.infolog_groupdav.inc.php | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php index 70e31584bf..15282a358a 100644 --- a/addressbook/inc/class.addressbook_groupdav.inc.php +++ b/addressbook/inc/class.addressbook_groupdav.inc.php @@ -392,7 +392,8 @@ class addressbook_groupdav extends groupdav_handler $contact = $this->read($save_ok); } - header('ETag: '.$this->get_etag($contact)); + // we should not return an etag here, as we never store the PUT vcard byte-by-byte + //header('ETag: '.$this->get_etag($contact)); // send GroupDAV Location header only if we dont use carddav_name as path-attribute if ($retval !== true && self::$path_attr == 'id') diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index a68ab974ea..43cc12d8ab 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -595,7 +595,8 @@ class calendar_groupdav extends groupdav_handler } } - header('ETag: '.$this->get_etag($cal_id)); + // we should not return an etag here, as we never store the PUT ical byte-by-byte + //header('ETag: '.$this->get_etag($cal_id)); // send GroupDAV Location header only if we dont use caldav_name as path-attribute if ($retval !== true && self::$path_attr != 'caldav_name') diff --git a/infolog/inc/class.infolog_groupdav.inc.php b/infolog/inc/class.infolog_groupdav.inc.php index 3460dee2f4..c41abef27e 100644 --- a/infolog/inc/class.infolog_groupdav.inc.php +++ b/infolog/inc/class.infolog_groupdav.inc.php @@ -292,6 +292,8 @@ class infolog_groupdav extends groupdav_handler if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!"); break; case 'time-range': + // ToDo: CalDAV time-range for VTODO checks DTSTART, DTEND, DUE and allways includes tasks if none given + // see http://tools.ietf.org/html/rfc4791#section-9.9 if ($this->debug > 1) error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}"); if (!empty($filter['attrs']['start'])) { @@ -427,7 +429,8 @@ class infolog_groupdav extends groupdav_handler $retval = '201 Created'; } - header('ETag: '.$this->get_etag($infoId)); + // we should not return an etag here, as we never store the PUT ical byte-by-byte + //header('ETag: '.$this->get_etag($infoId)); // send GroupDAV Location header only if we dont use caldav_name as path-attribute if ($retval !== true && self::$path_attr != 'caldav_name')