extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-24 15:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

* CalDAV/GroupDAV: return empty collection, as iCal under iOS 5 had problems with returning "404 Not found" status

Browse Source
This commit is contained in:
Ralf Becker 2011-09-30 12:52:40 +00:00
parent 90bc88449a
commit b11fa0302f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -165,7 +165,9 @@ class calendar_groupdav extends groupdav_handler
// process REPORT filters or multiget href's // process REPORT filters or multiget href's
if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options,$filter,$id)) if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options,$filter,$id))
{ {
return false; // return empty collection, as iCal under iOS 5 had problems with returning "404 Not found" status
// when trying to request not supported components, eg. VTODO on a calendar collection
return true;
} }
if ($this->debug > 1) if ($this->debug > 1)
{ {

5
infolog/inc/class.infolog_groupdav.inc.php
View File

@ -147,7 +147,9 @@ class infolog_groupdav extends groupdav_handler
// process REPORT filters or multiget href's // process REPORT filters or multiget href's
if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options,$filter,$id)) if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options,$filter,$id))
{ {
return false; // return empty collection, as iCal under iOS 5 had problems with returning "404 Not found" status
// when trying to request not supported components, eg. VTODO on a calendar collection
return true;
} }
if ($this->debug > 1) if ($this->debug > 1)
{ {
@ -171,6 +173,7 @@ class infolog_groupdav extends groupdav_handler
// return iterator, calling ourself to return result in chunks // return iterator, calling ourself to return result in chunks
$files['files'] = new groupdav_propfind_iterator($this,$path,$filter,$files['files']); $files['files'] = new groupdav_propfind_iterator($this,$path,$filter,$files['files']);
return true; return true;
} }