From a92d7ebd2fbe8c32c5ccc1c746a28dbdd3f6d45a Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 29 Oct 2008 08:45:31 +1300 Subject: [PATCH] Enable the scheduling extensions. --- debian/changelog | 6 ++++++ htdocs/caldav.php | 2 +- inc/caldav-OPTIONS.php | 2 +- testing/tests/regression-suite/001-Mulberry-1.result | 2 +- testing/tests/regression-suite/101-Evo-OPTIONS-1.result | 2 +- testing/tests/regression-suite/201-Moz-OPTIONS-2.result | 2 +- .../tests/regression-suite/302-Chandler-OPTIONS-2.result | 2 +- .../tests/regression-suite/308-Chandler-OPTIONS-3.result | 2 +- testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result | 2 +- testing/tests/regression-suite/601-Soho-OPTIONS.result | 2 +- 10 files changed, 15 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9030284f..9ff566ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +davical (0.9.5.91) unstable; urgency=low + + * Enable headers for caldav scheduling. + + -- Andrew McMillan Wed, 29 Oct 2008 08:28:35 +1300 + davical (0.9.5.90) unstable; urgency=low * Updated french debconf templates (closes: #501266) diff --git a/htdocs/caldav.php b/htdocs/caldav.php index 7511e588..79af0b40 100644 --- a/htdocs/caldav.php +++ b/htdocs/caldav.php @@ -26,7 +26,7 @@ if ( isset($c->override_dav_header) ) { $dav = $c->override_dav_header; } else { - $dav = "1, 2, access-control, calendar-access"; + $dav = "1, 2, 3, access-control, calendar-access, calendar-schedule"; } header( "DAV: $dav"); diff --git a/inc/caldav-OPTIONS.php b/inc/caldav-OPTIONS.php index 8307a86c..c18e260a 100644 --- a/inc/caldav-OPTIONS.php +++ b/inc/caldav-OPTIONS.php @@ -54,7 +54,7 @@ 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, REPORT, PROPPATCH"; + $allowed = "OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST"; if ( $request->path == '/' ) { $exists = true; $allowed = "OPTIONS, GET, HEAD, PROPFIND, REPORT"; diff --git a/testing/tests/regression-suite/001-Mulberry-1.result b/testing/tests/regression-suite/001-Mulberry-1.result index 46ea7fba..5c471d3f 100644 --- a/testing/tests/regression-suite/001-Mulberry-1.result +++ b/testing/tests/regression-suite/001-Mulberry-1.result @@ -1,7 +1,7 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule -Allow: OPTIONS, GET, HEAD, PUT, DELETE, REPORT, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, PROPPATCH, POST, MOVE, COPY, ACL, TRACE, SCHEDULE +Allow: OPTIONS, GET, HEAD, PROPFIND, REPORT Content-Length: 0 Content-Type: text/plain; charset="utf-8" diff --git a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result index 46ea7fba..1ca23afb 100644 --- a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result +++ b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result @@ -1,7 +1,7 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule -Allow: OPTIONS, GET, HEAD, PUT, DELETE, REPORT, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, PROPPATCH, POST, MOVE, COPY, ACL, TRACE, SCHEDULE +Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST Content-Length: 0 Content-Type: text/plain; charset="utf-8" diff --git a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result index 46ea7fba..1ca23afb 100644 --- a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result +++ b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result @@ -1,7 +1,7 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule -Allow: OPTIONS, GET, HEAD, PUT, DELETE, REPORT, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, PROPPATCH, POST, MOVE, COPY, ACL, TRACE, SCHEDULE +Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST Content-Length: 0 Content-Type: text/plain; charset="utf-8" diff --git a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result index 46ea7fba..1ca23afb 100644 --- a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result +++ b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result @@ -1,7 +1,7 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule -Allow: OPTIONS, GET, HEAD, PUT, DELETE, REPORT, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, PROPPATCH, POST, MOVE, COPY, ACL, TRACE, SCHEDULE +Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST Content-Length: 0 Content-Type: text/plain; charset="utf-8" diff --git a/testing/tests/regression-suite/308-Chandler-OPTIONS-3.result b/testing/tests/regression-suite/308-Chandler-OPTIONS-3.result index 46ea7fba..1ca23afb 100644 --- a/testing/tests/regression-suite/308-Chandler-OPTIONS-3.result +++ b/testing/tests/regression-suite/308-Chandler-OPTIONS-3.result @@ -1,7 +1,7 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule -Allow: OPTIONS, GET, HEAD, PUT, DELETE, REPORT, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, PROPPATCH, POST, MOVE, COPY, ACL, TRACE, SCHEDULE +Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST Content-Length: 0 Content-Type: text/plain; charset="utf-8" diff --git a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result index 46ea7fba..1ca23afb 100644 --- a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result +++ b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result @@ -1,7 +1,7 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule -Allow: OPTIONS, GET, HEAD, PUT, DELETE, REPORT, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, PROPPATCH, POST, MOVE, COPY, ACL, TRACE, SCHEDULE +Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST Content-Length: 0 Content-Type: text/plain; charset="utf-8" diff --git a/testing/tests/regression-suite/601-Soho-OPTIONS.result b/testing/tests/regression-suite/601-Soho-OPTIONS.result index 46ea7fba..1ca23afb 100644 --- a/testing/tests/regression-suite/601-Soho-OPTIONS.result +++ b/testing/tests/regression-suite/601-Soho-OPTIONS.result @@ -1,7 +1,7 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule -Allow: OPTIONS, GET, HEAD, PUT, DELETE, REPORT, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, PROPPATCH, POST, MOVE, COPY, ACL, TRACE, SCHEDULE +Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH, POST Content-Length: 0 Content-Type: text/plain; charset="utf-8"