diff --git a/inc/caldav-OPTIONS.php b/inc/caldav-OPTIONS.php index 4efafaa9..f12c2f4d 100644 --- a/inc/caldav-OPTIONS.php +++ b/inc/caldav-OPTIONS.php @@ -54,21 +54,19 @@ if ( !$exists ) { if ( isset($c->override_allowed_methods) ) $allowed = $c->override_allowed_methods; else { - $allowed = "OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK"; - if ( $is_calendar ) $allowed .= ", REPORT"; + $allowed = "OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT"; } header( "Allow: $allowed"); /** * From reading the "Scheduling Extensions to CalDAV" draft I don't think that we will -* be doing this any time soon. The current spec is at: +* be doing 'calendar-schedule' any time soon. The current spec is at: * http://www.ietf.org/internet-drafts/draft-desruisseaux-caldav-sched-02.txt * * access-control is rfc3744, so we will say we do it, but I doubt if we do it -* in all it's glory really. +* in all (or even much of) it's glory really. */ -$dav = "1, 2, access-control"; -if ( $is_calendar ) $dav .= ", calendar-access"; +$dav = "1, 2, access-control, calendar-access"; header( "Allow: $allowed"); header( "DAV: $dav"); // header( "DAV: 1, 2, access-control, calendar-access, calendar-schedule");