[CalendarServer-changes] [197] CalendarServer/trunk/doc/RFC

source_changes at macosforge.org source_changes at macosforge.org
Mon Sep 25 19:38:56 PDT 2006


Revision: 197
          http://trac.macosforge.org/projects/calendarserver/changeset/197
Author:   cdaboo at apple.com
Date:     2006-09-25 19:38:55 -0700 (Mon, 25 Sep 2006)

Log Message:
-----------
Updates & additions to RFCs.

Modified Paths:
--------------
    CalendarServer/trunk/doc/RFC/draft-dusseault-caldav.txt

Added Paths:
-----------
    CalendarServer/trunk/doc/RFC/rfc4331-WebDAV Quota.txt

Modified: CalendarServer/trunk/doc/RFC/draft-dusseault-caldav.txt
===================================================================
--- CalendarServer/trunk/doc/RFC/draft-dusseault-caldav.txt	2006-09-26 02:23:29 UTC (rev 196)
+++ CalendarServer/trunk/doc/RFC/draft-dusseault-caldav.txt	2006-09-26 02:38:55 UTC (rev 197)
@@ -2,16 +2,16 @@
 
 
 Network Working Group                                           C. Daboo
-Internet-Draft
-Expires: January 15, 2007                                B. Desruisseaux
+Internet-Draft                                            Apple Computer
+Expires: March 17, 2007                                  B. Desruisseaux
                                                                   Oracle
                                                             L. Dusseault
                                                                     OSAF
-                                                           July 14, 2006
+                                                      September 13, 2006
 
 
                Calendaring Extensions to WebDAV (CalDAV)
-                       draft-dusseault-caldav-13
+                       draft-dusseault-caldav-15
 
 Status of this Memo
 
@@ -36,7 +36,7 @@
    The list of Internet-Draft Shadow Directories can be accessed at
    http://www.ietf.org/shadow.html.
 
-   This Internet-Draft will expire on January 15, 2007.
+   This Internet-Draft will expire on March 17, 2007.
 
 Copyright Notice
 
@@ -52,9 +52,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007                [Page 1]
+Daboo, et al.            Expires March 17, 2007                 [Page 1]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    and calendar publishing.
@@ -65,144 +65,150 @@
    1.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . .   5
      1.1.  Notational Conventions  . . . . . . . . . . . . . . . . .   5
      1.2.  XML Namespaces and Processing . . . . . . . . . . . . . .   5
+     1.3.  Method Preconditions and Postconditions . . . . . . . . .   6
    2.  Requirements Overview . . . . . . . . . . . . . . . . . . . .   6
    3.  Calendaring Data Model  . . . . . . . . . . . . . . . . . . .   7
      3.1.  Calendar Server . . . . . . . . . . . . . . . . . . . . .   7
      3.2.  Recurrence and the Data Model . . . . . . . . . . . . . .   8
-   4.  Calendar Resources  . . . . . . . . . . . . . . . . . . . . .   8
-     4.1.  Calendar Object Resources . . . . . . . . . . . . . . . .   8
+   4.  Calendar Resources  . . . . . . . . . . . . . . . . . . . . .   9
+     4.1.  Calendar Object Resources . . . . . . . . . . . . . . . .   9
      4.2.  Calendar Collection . . . . . . . . . . . . . . . . . . .  10
    5.  Calendar Access Feature . . . . . . . . . . . . . . . . . . .  11
      5.1.  Calendar Access Support . . . . . . . . . . . . . . . . .  11
        5.1.1.  Example: Using OPTIONS for the Discovery of
-               Calendar Access Support . . . . . . . . . . . . . . .  11
-     5.2.  Calendar Collection Properties  . . . . . . . . . . . . .  11
-       5.2.1.  CALDAV:calendar-description Property  . . . . . . . .  11
-       5.2.2.  CALDAV:calendar-timezone Property . . . . . . . . . .  12
+               Calendar Access Support . . . . . . . . . . . . . . .  12
+     5.2.  Calendar Collection Properties  . . . . . . . . . . . . .  12
+       5.2.1.  CALDAV:calendar-description Property  . . . . . . . .  12
+       5.2.2.  CALDAV:calendar-timezone Property . . . . . . . . . .  13
        5.2.3.  CALDAV:supported-calendar-component-set Property  . .  14
        5.2.4.  CALDAV:supported-calendar-data Property . . . . . . .  15
-       5.2.5.  CALDAV:max-resource-size Property . . . . . . . . . .  15
-       5.2.6.  CALDAV:min-date-time Property . . . . . . . . . . . .  16
-       5.2.7.  CALDAV:max-date-time Property . . . . . . . . . . . .  17
+       5.2.5.  CALDAV:max-resource-size Property . . . . . . . . . .  16
+       5.2.6.  CALDAV:min-date-time Property . . . . . . . . . . . .  17
+       5.2.7.  CALDAV:max-date-time Property . . . . . . . . . . . .  18
        5.2.8.  CALDAV:max-instances Property . . . . . . . . . . . .  18
        5.2.9.  CALDAV:max-attendees-per-instance Property  . . . . .  19
-       5.2.10. Additional Precondition for PROPPATCH . . . . . . . .  19
+       5.2.10. Additional Precondition for PROPPATCH . . . . . . . .  20
      5.3.  Creating Resources  . . . . . . . . . . . . . . . . . . .  20
        5.3.1.  MKCALENDAR Method . . . . . . . . . . . . . . . . . .  20
-         5.3.1.1.  Status Codes  . . . . . . . . . . . . . . . . . .  21
-         5.3.1.2.  Example: Successful MKCALENDAR request  . . . . .  22
-       5.3.2.  Creating Calendar Object Resources  . . . . . . . . .  24
-         5.3.2.1.  Additional Preconditions for PUT, COPY and MOVE .  25
-       5.3.3.  Non-standard components, properties and parameters  .  27
-       5.3.4.  Calendar Object Resource Entity Tag . . . . . . . . .  27
-   6.  Calendaring Access Control  . . . . . . . . . . . . . . . . .  28
-     6.1.  Calendaring Privilege . . . . . . . . . . . . . . . . . .  28
-       6.1.1.  CALDAV:read-free-busy Privilege . . . . . . . . . . .  28
-     6.2.  Additional Principal Property . . . . . . . . . . . . . .  29
-       6.2.1.  CALDAV:calendar-home-set Property . . . . . . . . . .  29
-   7.  Calendaring Reports . . . . . . . . . . . . . . . . . . . . .  30
-     7.1.  REPORT Method . . . . . . . . . . . . . . . . . . . . . .  30
-     7.2.  Ordinary collections  . . . . . . . . . . . . . . . . . .  30
-     7.3.  Date and floating time  . . . . . . . . . . . . . . . . .  31
-     7.4.  Time range filtering  . . . . . . . . . . . . . . . . . .  31
+         5.3.1.1.  Status Codes  . . . . . . . . . . . . . . . . . .  22
+         5.3.1.2.  Example: Successful MKCALENDAR request  . . . . .  23
+       5.3.2.  Creating Calendar Object Resources  . . . . . . . . .  25
+         5.3.2.1.  Additional Preconditions for PUT, COPY and MOVE .  26
+       5.3.3.  Non-standard components, properties and parameters  .  28
+       5.3.4.  Calendar Object Resource Entity Tag . . . . . . . . .  28
+   6.  Calendaring Access Control  . . . . . . . . . . . . . . . . .  29
+     6.1.  Calendaring Privilege . . . . . . . . . . . . . . . . . .  29
+       6.1.1.  CALDAV:read-free-busy Privilege . . . . . . . . . . .  29
+     6.2.  Additional Principal Property . . . . . . . . . . . . . .  30
+       6.2.1.  CALDAV:calendar-home-set Property . . . . . . . . . .  30
+   7.  Calendaring Reports . . . . . . . . . . . . . . . . . . . . .  31
+     7.1.  REPORT Method . . . . . . . . . . . . . . . . . . . . . .  31
+     7.2.  Ordinary collections  . . . . . . . . . . . . . . . . . .  31
+     7.3.  Date and floating time  . . . . . . . . . . . . . . . . .  32
 
 
 
-Daboo, et al.           Expires January 15, 2007                [Page 2]
+Daboo, et al.            Expires March 17, 2007                 [Page 2]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-     7.5.  Partial Retrieval . . . . . . . . . . . . . . . . . . . .  32
-     7.6.  Non-standard components, properties and parameters  . . .  33
-     7.7.  CALDAV:calendar-query Report  . . . . . . . . . . . . . .  33
-       7.7.1.  Example: Partial retrieval of events by time range  .  35
-       7.7.2.  Example: Partial retrieval of recurring events  . . .  39
-       7.7.3.  Example: Expanded retrieval of recurring events . . .  42
-       7.7.4.  Example: Partial retrieval of stored free busy
-               components  . . . . . . . . . . . . . . . . . . . . .  44
-       7.7.5.  Example: Retrieval of to-dos by alarm time range  . .  46
-       7.7.6.  Example: Retrieval of event by UID  . . . . . . . . .  48
-       7.7.7.  Example: Retrieval of events by PARTSTAT  . . . . . .  50
-       7.7.8.  Example: Retrieval of events only . . . . . . . . . .  52
-       7.7.9.  Example: Retrieval of all pending to-dos  . . . . . .  56
-       7.7.10. Example: Attempt to query unsupported property  . . .  59
-     7.8.  CALDAV:calendar-multiget Report . . . . . . . . . . . . .  60
-       7.8.1.  Example: Successful CALDAV:calendar-multiget Report .  61
-     7.9.  CALDAV:free-busy-query Report . . . . . . . . . . . . . .  63
-       7.9.1.  Example: Successful CALDAV:free-busy-query Report . .  65
-   8.  Guidelines  . . . . . . . . . . . . . . . . . . . . . . . . .  65
-     8.1.  Client-to-client Interoperability . . . . . . . . . . . .  66
-     8.2.  Synchronization Operations  . . . . . . . . . . . . . . .  66
-       8.2.1.  Use of Reports  . . . . . . . . . . . . . . . . . . .  66
-         8.2.1.1.  Restrict the Time Range . . . . . . . . . . . . .  66
-         8.2.1.2.  Synchronize by Time Range . . . . . . . . . . . .  66
-         8.2.1.3.  Synchronization Process . . . . . . . . . . . . .  67
-       8.2.2.  Restrict the Properties Returned  . . . . . . . . . .  69
-     8.3.  Use of Locking  . . . . . . . . . . . . . . . . . . . . .  69
-     8.4.  Finding calendars . . . . . . . . . . . . . . . . . . . .  69
-     8.5.  Storing and Using Attachments . . . . . . . . . . . . . .  71
-       8.5.1.  Inline attachments  . . . . . . . . . . . . . . . . .  71
-       8.5.2.  External attachments  . . . . . . . . . . . . . . . .  72
-     8.6.  Storing and Using Alarms  . . . . . . . . . . . . . . . .  73
-   9.  XML Element Definitions . . . . . . . . . . . . . . . . . . .  74
-     9.1.  CALDAV:calendar XML Element . . . . . . . . . . . . . . .  74
-     9.2.  CALDAV:mkcalendar XML Element . . . . . . . . . . . . . .  74
-     9.3.  CALDAV:mkcalendar-response XML Element  . . . . . . . . .  74
-     9.4.  CALDAV:calendar-query XML Element . . . . . . . . . . . .  75
-     9.5.  CALDAV:calendar-data XML Element  . . . . . . . . . . . .  75
-       9.5.1.  CALDAV:comp XML Element . . . . . . . . . . . . . . .  77
-       9.5.2.  CALDAV:allcomp XML Element  . . . . . . . . . . . . .  77
-       9.5.3.  CALDAV:allprop XML Element  . . . . . . . . . . . . .  77
-       9.5.4.  CALDAV:prop XML Element . . . . . . . . . . . . . . .  78
-       9.5.5.  CALDAV:expand XML Element . . . . . . . . . . . . . .  79
-       9.5.6.  CALDAV:limit-recurrence-set XML Element . . . . . . .  79
-       9.5.7.  CALDAV:limit-freebusy-set XML Element . . . . . . . .  80
-     9.6.  CALDAV:filter XML Element . . . . . . . . . . . . . . . .  81
-       9.6.1.  CALDAV:comp-filter XML Element  . . . . . . . . . . .  81
-       9.6.2.  CALDAV:prop-filter XML Element  . . . . . . . . . . .  82
+     7.4.  Time range filtering  . . . . . . . . . . . . . . . . . .  32
+     7.5.  Searching Text: Collations  . . . . . . . . . . . . . . .  33
+       7.5.1.  CALDAV:supported-collation-set Property . . . . . . .  34
+     7.6.  Partial Retrieval . . . . . . . . . . . . . . . . . . . .  34
+     7.7.  Non-standard components, properties and parameters  . . .  35
+     7.8.  CALDAV:calendar-query Report  . . . . . . . . . . . . . .  35
+       7.8.1.  Example: Partial retrieval of events by time range  .  38
+       7.8.2.  Example: Partial retrieval of recurring events  . . .  42
+       7.8.3.  Example: Expanded retrieval of recurring events . . .  45
+       7.8.4.  Example: Partial retrieval of stored free busy
+               components  . . . . . . . . . . . . . . . . . . . . .  47
+       7.8.5.  Example: Retrieval of to-dos by alarm time range  . .  49
+       7.8.6.  Example: Retrieval of event by UID  . . . . . . . . .  51
+       7.8.7.  Example: Retrieval of events by PARTSTAT  . . . . . .  53
+       7.8.8.  Example: Retrieval of events only . . . . . . . . . .  55
+       7.8.9.  Example: Retrieval of all pending to-dos  . . . . . .  59
+       7.8.10. Example: Attempt to query unsupported property  . . .  62
+     7.9.  CALDAV:calendar-multiget Report . . . . . . . . . . . . .  63
+       7.9.1.  Example: Successful CALDAV:calendar-multiget Report .  64
+     7.10. CALDAV:free-busy-query Report . . . . . . . . . . . . . .  66
+       7.10.1. Example: Successful CALDAV:free-busy-query Report . .  68
+   8.  Guidelines  . . . . . . . . . . . . . . . . . . . . . . . . .  68
+     8.1.  Client-to-client Interoperability . . . . . . . . . . . .  69
+     8.2.  Synchronization Operations  . . . . . . . . . . . . . . .  69
+       8.2.1.  Use of Reports  . . . . . . . . . . . . . . . . . . .  69
+         8.2.1.1.  Restrict the Time Range . . . . . . . . . . . . .  69
+         8.2.1.2.  Synchronize by Time Range . . . . . . . . . . . .  69
+         8.2.1.3.  Synchronization Process . . . . . . . . . . . . .  70
+       8.2.2.  Restrict the Properties Returned  . . . . . . . . . .  72
+     8.3.  Use of Locking  . . . . . . . . . . . . . . . . . . . . .  72
+     8.4.  Finding calendars . . . . . . . . . . . . . . . . . . . .  72
+     8.5.  Storing and Using Attachments . . . . . . . . . . . . . .  74
+       8.5.1.  Inline attachments  . . . . . . . . . . . . . . . . .  74
+       8.5.2.  External attachments  . . . . . . . . . . . . . . . .  75
+     8.6.  Storing and Using Alarms  . . . . . . . . . . . . . . . .  76
+   9.  XML Element Definitions . . . . . . . . . . . . . . . . . . .  77
+     9.1.  CALDAV:calendar XML Element . . . . . . . . . . . . . . .  77
+     9.2.  CALDAV:mkcalendar XML Element . . . . . . . . . . . . . .  77
+     9.3.  CALDAV:mkcalendar-response XML Element  . . . . . . . . .  77
+     9.4.  CALDAV:supported-collation XML Element  . . . . . . . . .  78
+     9.5.  CALDAV:calendar-query XML Element . . . . . . . . . . . .  78
+     9.6.  CALDAV:calendar-data XML Element  . . . . . . . . . . . .  79
+       9.6.1.  CALDAV:comp XML Element . . . . . . . . . . . . . . .  80
+       9.6.2.  CALDAV:allcomp XML Element  . . . . . . . . . . . . .  80
+       9.6.3.  CALDAV:allprop XML Element  . . . . . . . . . . . . .  81
+       9.6.4.  CALDAV:prop XML Element . . . . . . . . . . . . . . .  81
+       9.6.5.  CALDAV:expand XML Element . . . . . . . . . . . . . .  82
+       9.6.6.  CALDAV:limit-recurrence-set XML Element . . . . . . .  83
 
 
 
-Daboo, et al.           Expires January 15, 2007                [Page 3]
+Daboo, et al.            Expires March 17, 2007                 [Page 3]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-       9.6.3.  CALDAV:param-filter XML Element . . . . . . . . . . .  83
-       9.6.4.  CALDAV:is-not-defined XML Element . . . . . . . . . .  83
-       9.6.5.  CALDAV:text-match XML Element . . . . . . . . . . . .  84
-     9.7.  CALDAV:timezone XML Element . . . . . . . . . . . . . . .  84
-     9.8.  CALDAV:time-range XML Element . . . . . . . . . . . . . .  85
-     9.9.  CALDAV:calendar-multiget XML Element  . . . . . . . . . .  89
-     9.10. CALDAV:free-busy-query XML Element  . . . . . . . . . . .  90
-   10. Internationalization Considerations . . . . . . . . . . . . .  90
-   11. Security Considerations . . . . . . . . . . . . . . . . . . .  90
-   12. IANA Consideration  . . . . . . . . . . . . . . . . . . . . .  91
-     12.1. Namespace Registration  . . . . . . . . . . . . . . . . .  91
-   13. Acknowledgements  . . . . . . . . . . . . . . . . . . . . . .  92
-   14. References  . . . . . . . . . . . . . . . . . . . . . . . . .  92
-     14.1. Normative References  . . . . . . . . . . . . . . . . . .  92
-     14.2. Informative References  . . . . . . . . . . . . . . . . .  93
-   Appendix A.  CalDAV Method Privilege Table (Normative)  . . . . .  93
-   Appendix B.  Calendar collections used in the examples  . . . . .  94
+       9.6.7.  CALDAV:limit-freebusy-set XML Element . . . . . . . .  84
+     9.7.  CALDAV:filter XML Element . . . . . . . . . . . . . . . .  84
+       9.7.1.  CALDAV:comp-filter XML Element  . . . . . . . . . . .  85
+       9.7.2.  CALDAV:prop-filter XML Element  . . . . . . . . . . .  85
+       9.7.3.  CALDAV:param-filter XML Element . . . . . . . . . . .  86
+       9.7.4.  CALDAV:is-not-defined XML Element . . . . . . . . . .  87
+       9.7.5.  CALDAV:text-match XML Element . . . . . . . . . . . .  87
+     9.8.  CALDAV:timezone XML Element . . . . . . . . . . . . . . .  88
+     9.9.  CALDAV:time-range XML Element . . . . . . . . . . . . . .  88
+     9.10. CALDAV:calendar-multiget XML Element  . . . . . . . . . .  93
+     9.11. CALDAV:free-busy-query XML Element  . . . . . . . . . . .  94
+   10. Internationalization Considerations . . . . . . . . . . . . .  94
+   11. Security Considerations . . . . . . . . . . . . . . . . . . .  94
+   12. IANA Consideration  . . . . . . . . . . . . . . . . . . . . .  95
+     12.1. Namespace Registration  . . . . . . . . . . . . . . . . .  95
+   13. Acknowledgements  . . . . . . . . . . . . . . . . . . . . . .  96
+   14. References  . . . . . . . . . . . . . . . . . . . . . . . . .  96
+     14.1. Normative References  . . . . . . . . . . . . . . . . . .  96
+     14.2. Informative References  . . . . . . . . . . . . . . . . .  97
+   Appendix A.  CalDAV Method Privilege Table (Normative)  . . . . .  97
+   Appendix B.  Calendar collections used in the examples  . . . . .  98
    Appendix C.  Changes (to be removed prior to publication as an
-                RFC) . . . . . . . . . . . . . . . . . . . . . . . . 100
-     C.1.  Changes in -13  . . . . . . . . . . . . . . . . . . . . . 100
-     C.2.  Changes in -12  . . . . . . . . . . . . . . . . . . . . . 101
-     C.3.  Changes in -11  . . . . . . . . . . . . . . . . . . . . . 101
-     C.4.  Changes in -10  . . . . . . . . . . . . . . . . . . . . . 102
-     C.5.  Changes in -09  . . . . . . . . . . . . . . . . . . . . . 103
-     C.6.  Changes in -08  . . . . . . . . . . . . . . . . . . . . . 104
-     C.7.  Changes in -07  . . . . . . . . . . . . . . . . . . . . . 105
-     C.8.  Changes in -06  . . . . . . . . . . . . . . . . . . . . . 106
-     C.9.  Changes in -05  . . . . . . . . . . . . . . . . . . . . . 106
-     C.10. Changes in -04  . . . . . . . . . . . . . . . . . . . . . 107
-     C.11. Changes in -03  . . . . . . . . . . . . . . . . . . . . . 108
-     C.12. Changes in -02  . . . . . . . . . . . . . . . . . . . . . 108
-     C.13. Changes in -01  . . . . . . . . . . . . . . . . . . . . . 108
-   Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . . 109
-   Intellectual Property and Copyright Statements  . . . . . . . . . 110
+                RFC) . . . . . . . . . . . . . . . . . . . . . . . . 104
+     C.1.  Changes in -15  . . . . . . . . . . . . . . . . . . . . . 104
+     C.2.  Changes in -14  . . . . . . . . . . . . . . . . . . . . . 105
+     C.3.  Changes in -13  . . . . . . . . . . . . . . . . . . . . . 105
+     C.4.  Changes in -12  . . . . . . . . . . . . . . . . . . . . . 106
+     C.5.  Changes in -11  . . . . . . . . . . . . . . . . . . . . . 106
+     C.6.  Changes in -10  . . . . . . . . . . . . . . . . . . . . . 107
+     C.7.  Changes in -09  . . . . . . . . . . . . . . . . . . . . . 108
+     C.8.  Changes in -08  . . . . . . . . . . . . . . . . . . . . . 109
+     C.9.  Changes in -07  . . . . . . . . . . . . . . . . . . . . . 110
+     C.10. Changes in -06  . . . . . . . . . . . . . . . . . . . . . 111
+     C.11. Changes in -05  . . . . . . . . . . . . . . . . . . . . . 111
+     C.12. Changes in -04  . . . . . . . . . . . . . . . . . . . . . 112
+     C.13. Changes in -03  . . . . . . . . . . . . . . . . . . . . . 113
+     C.14. Changes in -02  . . . . . . . . . . . . . . . . . . . . . 113
+     C.15. Changes in -01  . . . . . . . . . . . . . . . . . . . . . 113
+   Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . . 114
+   Intellectual Property and Copyright Statements  . . . . . . . . . 115
 
 
 
@@ -214,35 +220,26 @@
 
 
 
-
-
-
-
-
-
-Daboo, et al.           Expires January 15, 2007                [Page 4]
+Daboo, et al.            Expires March 17, 2007                 [Page 4]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
 1.  Introduction
 
-   The concept of using HTTP [RFC2616] and WebDAV [I-D.ietf-webdav-
-   rfc2518bis] as a basis for a calendar access protocol is by no means
-   a new concept: it was discussed in the IETF CALSCH working group as
-   early as 1997 or 1998.  Several companies have implemented calendar
-   access protocols using HTTP to upload and download iCalendar
-   [RFC2445] objects, and using WebDAV to get listings of resources.
-   However, those implementations do not interoperate because there are
-   many small and big decisions to be made in how to model calendaring
-   data as WebDAV resources, as well as how to implement required
-   features that aren't already part of WebDAV.  This document proposes
-   a way to model calendar data in WebDAV, with additional features to
-   make an interoperable calendar access protocol.
+   The concept of using HTTP [RFC2616] and WebDAV [RFC2518] as a basis
+   for a calendar access protocol is by no means a new concept: it was
+   discussed in the IETF CALSCH working group as early as 1997 or 1998.
+   Several companies have implemented calendar access protocols using
+   HTTP to upload and download iCalendar [RFC2445] objects, and using
+   WebDAV to get listings of resources.  However, those implementations
+   do not interoperate because there are many small and big decisions to
+   be made in how to model calendaring data as WebDAV resources, as well
+   as how to implement required features that aren't already part of
+   WebDAV.  This document proposes a way to model calendar data in
+   WebDAV, with additional features to make an interoperable calendar
+   access protocol.
 
-   Discussion of this specification is taking place on the mailing list
-   <http://lists.osafoundation.org/mailman/listinfo/ietf-caldav>.
-
 1.1.  Notational Conventions
 
    The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
@@ -261,7 +258,7 @@
 
    Definitions of XML elements in this document use XML element type
    declarations (as found in XML Document Type Declarations), described
-   in Section 3.2 of [W3C.REC-xml-20040204].
+   in Section 3.2 of [W3C.REC-xml-20060816].
 
    The namespace "urn:ietf:params:xml:ns:caldav" is reserved for the XML
    elements defined in this specification, its revisions, and related
@@ -270,30 +267,49 @@
    namespace, and instead should use a namespace that they control.
 
    The XML declarations used in this document do not include namespace
-   information.  Thus, implementers MUST NOT use these declarations as
+   information.  Thus, implementers must not use these declarations as
    the only way to create valid CalDAV properties or to validate CalDAV
    XML element type.  Some of the declarations refer to XML elements
+   defined by WebDAV [RFC2518] which use the "DAV:" namespace.  Wherever
+   such XML elements appear, they are explicitly prefixed with "DAV:" to
+   avoid confusion.
 
 
 
-Daboo, et al.           Expires January 15, 2007                [Page 5]
+Daboo, et al.            Expires March 17, 2007                 [Page 5]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-   defined by WebDAV [I-D.ietf-webdav-rfc2518bis] which use the "DAV:"
-   namespace.  Wherever such XML elements appear, they are explicitly
-   prefixed with "DAV:" to avoid confusion.
-
    Also note that some CalDAV XML element names are identical to WebDAV
    XML element names, though their namespace differs.  Care must be
    taken not to confuse the two sets of names.
 
    Processing of XML by CalDAV clients and servers MUST follow the rules
-   described in [I-D.ietf-webdav-rfc2518bis], in particular Sections 8.2
-   and 17, and Appendix A of that specification.
+   described in [RFC2518], in particular Section 14, and Appendices 3
+   and 4 of that specification.
 
+1.3.  Method Preconditions and Postconditions
 
+   A "precondition" of a method describes the state of the server that
+   must be true for that method to be performed.  A "postcondition" of a
+   method describes the state of the server that must be true after that
+   method has been completed.  If a method precondition or postcondition
+   for a request is not satisfied, the response status of the request
+   MUST be either 403 (Forbidden) if the request should not be repeated
+   because it will always fail, or 409 (Conflict) if it is expected that
+   the user might be able to resolve the conflict and resubmit the
+   request.
+
+   In order to allow better client handling of 403 and 409 responses, a
+   distinct XML element type is associated with each method precondition
+   and postcondition of a request.  When a particular precondition is
+   not satisfied or a particular postcondition cannot be achieved, the
+   appropriate XML element MUST be returned as the child of a top-level
+   DAV:error element in the response body, unless otherwise negotiated
+   by the request.
+
+
 2.  Requirements Overview
 
    This section lists what functionality is required of a CalDAV server.
@@ -302,8 +318,9 @@
    o  MUST support iCalendar [RFC2445] as a media type for calendar
       object resource format;
 
-   o  MUST support WebDAV Class 1 and Class 3 [I-D.ietf-webdav-
-      rfc2518bis];
+   o  MUST support WebDAV Class 1 [RFC2518] (note that [I-D.ietf-webdav-
+      rfc2518bis] describes clarifications to [RFC2518] that aid
+      interoperability);
 
    o  MUST support WebDAV ACL [RFC3744] with the additional privilege
       defined in Section 6.1 of this document;
@@ -311,6 +328,15 @@
    o  MUST support transport over TLS [RFC2246] as defined in [RFC2818]
       (note that [RFC2246] has been obsoleted by [RFC4346]);
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                 [Page 6]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    o  MUST support ETags [RFC2616] with additional requirements
       specified in Section 5.3.4 of this document;
 
@@ -328,15 +354,6 @@
       this document.
 
 
-
-
-
-
-Daboo, et al.           Expires January 15, 2007                [Page 6]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
 3.  Calendaring Data Model
 
    One of the features which has made WebDAV a successful protocol is
@@ -368,6 +385,14 @@
    or other Web server extension).
 
    A WebDAV repository MAY include calendar data in some parts of its
+
+
+
+Daboo, et al.            Expires March 17, 2007                 [Page 7]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    URL namespace, and non-calendaring data in other parts.
 
    A WebDAV repository can advertise itself as a CalDAV server if it
@@ -385,23 +410,14 @@
    collection.
 
    The CalDAV server or repository is the canonical location for
+   calendar data and state information.  Clients may submit requests to
+   change data or download data.  Clients may store calendar objects
+   offline and attempt to synchronize at a later time.  However, clients
+   MUST be prepared for calendar data on the server to change between
+   the time of last synchronization and when attempting an update, as
+   calendar collections may be shared and accessible via multiple
+   clients.  Entity tags and other features make this possible.
 
-
-
-Daboo, et al.           Expires January 15, 2007                [Page 7]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
-   calendar data and state information.  Both CalDAV servers and clients
-   MUST ensure that the data is consistent and compliant.  Clients may
-   submit requests to change data or download data.  Clients may store
-   calendar objects offline and attempt to synchronize at a later time.
-   However, clients MUST be prepared for calendar data on the server to
-   change between the time of last synchronization and when attempting
-   an update, as calendar collections may be shared and accessible via
-   multiple clients.  Entity tags and other features make this possible.
-
 3.2.  Recurrence and the Data Model
 
    Recurrence is an important part of the data model because it governs
@@ -426,6 +442,13 @@
    time range.
 
 
+
+
+Daboo, et al.            Expires March 17, 2007                 [Page 8]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
 4.  Calendar Resources
 
 4.1.  Calendar Object Resources
@@ -441,14 +464,6 @@
    stored in separate calendar object resources in the same collection.
 
    Calendar object resources contained in calendar collections MUST NOT
-
-
-
-Daboo, et al.           Expires January 15, 2007                [Page 8]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
    specify the iCalendar METHOD property.
 
    The UID property value of the calendar components contained in a
@@ -470,6 +485,26 @@
 
    For example, given the following iCalendar object:
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                 [Page 9]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
     BEGIN:VCALENDAR
     PRODID:-//Example Corp.//CalDAV Client//EN
     VERSION:2.0
@@ -498,13 +533,6 @@
     END:VEVENT
     END:VCALENDAR
 
-
-
-Daboo, et al.           Expires January 15, 2007                [Page 9]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
    The VEVENT component with the UID value "1 at example.com", would be
    stored in its own calendar object resource.  The two VEVENT
    components with the UID value "2 at example.com", which represent a
@@ -525,6 +553,14 @@
 
    A calendar collection can be created through provisioning (e.g.,
    automatically created when a user's account is provisioned), or it
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 10]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    can be created with the MKCALENDAR method (see Section 5.3.1).  This
    method can be useful for a user to create additional calendars (e.g.,
    soccer schedule) or for users to share a calendar (e.g., team events
@@ -554,13 +590,6 @@
        any calendar object resources contained in the calendar
        collection.
 
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 10]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
    Multiple calendar collections MAY be children of the same collection.
 
 
@@ -575,6 +604,19 @@
    access" in the DAV response header MUST indicate that the server
    supports all MUST level requirements specified in this document.
 
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 11]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
 5.1.1.  Example: Using OPTIONS for the Discovery of Calendar Access
         Support
 
@@ -606,17 +648,6 @@
 
    Name: calendar-description
 
-
-
-
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 11]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
    Namespace: urn:ietf:params:xml:ns:caldav
 
    Purpose: Provides a human-readable description of the calendar
@@ -624,17 +655,24 @@
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MAY be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).  An xml:lang attribute indicating
-      the human language of the description SHOULD be set for this
-      property by clients or through server provisioning.  Servers MUST
-      return any xml:lang attribute if set for the property.
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).  An xml:lang attribute indicating the human language
+      of the description SHOULD be set for this property by clients or
+      through server provisioning.  Servers MUST return any xml:lang
+      attribute if set for the property.
 
    Description: If present, the property contains a description of the
       calendar collection that is suitable for presentation to a user.
       If not present, the client should assume no description for the
       calendar collection.
 
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 12]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Definition:
 
          <!ELEMENT calendar-description (#PCDATA)>
@@ -656,8 +694,7 @@
 
    Conformance: This property SHOULD be defined on all calendar
       collections.  If defined, it SHOULD NOT be returned by a PROPFIND
-      DAV:allprop request (as defined in Section 14.2 of [I-D.ietf-
-      webdav-rfc2518bis]).
+      DAV:allprop request (as defined in Section 12.14.1 of [RFC2518]).
 
    Description: The CALDAV:calendar-timezone property is used to specify
       the time zone the server should rely on to resolve "date" values
@@ -665,14 +702,6 @@
       with UTC time" values.  The server will require this information
       to determine if a calendar component scheduled with "date" values
       or "date with local time" values overlaps a CALDAV:time-range
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 12]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
       specified in a CALDAV:calendar-query REPORT.  The server will also
       require this information to compute the proper FREEBUSY time
       period as "date with UTC time" in the VFREEBUSY component returned
@@ -684,7 +713,7 @@
    Note: The iCalendar data embedded within the CALDAV:calendar-timezone
       XML element MUST follow the standard XML character data encoding
       rules, including use of &lt;, &gt;, &amp; etc entity encoding or
-      the use of a <[!CDATA[ ... ]]> construct.  In the later case the
+      the use of a <![CDATA[ ... ]]> construct.  In the later case the
       iCalendar data cannot contain the character sequence "]]>" which
       is the end delimiter for the CDATA section.
 
@@ -692,6 +721,14 @@
 
          <!ELEMENT calendar-timezone (#PCDATA)>
          PCDATA value: an iCalendar object with exactly one VTIMEZONE
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 13]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
                component.
 
    Example:
@@ -721,14 +758,6 @@
    END:VCALENDAR
    </C:calendar-timezone>
 
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 13]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
 5.2.3.  CALDAV:supported-calendar-component-set Property
 
    Name: supported-calendar-component-set
@@ -741,13 +770,21 @@
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:supported-calendar-component-set property is
       used to specify restrictions on the calendar component types that
       calendar object resources may contain in a calendar collection.
       Any attempt by the client to store calendar object resources with
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 14]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
       component types not listed in this property, if it exists, MUST
       result in an error, with the CALDAV:supported-calendar-component
       precondition (Section 5.3.2.1) being violated.  Since this
@@ -774,17 +811,6 @@
            <C:comp name="VTODO"/>
          </C:supported-calendar-component-set>
 
-
-
-
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 14]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
 5.2.4.  CALDAV:supported-calendar-data Property
 
    Name: supported-calendar-data
@@ -796,8 +822,8 @@
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:supported-calendar-data property is used to
       specify the media type supported for the calendar object resources
@@ -806,7 +832,15 @@
       resources with a media type not listed in this property MUST
       result in an error, with the CALDAV:supported-calendar-data
       precondition (Section 5.3.2.1) being violated.  In the absence of
-      this property the server MUST accept data with the media type
+      this property the server MUST only accept data with the media type
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 15]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
       "text/calendar" and iCalendar version 2.0, and clients can assume
       that.
 
@@ -831,20 +865,10 @@
       resource in octets that the server is willing to accept when a
       calendar object resource is stored in a calendar collection.
 
-
-
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 15]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:max-resource-size is used to specify a
       numeric value that represents the maximum size in octets that the
@@ -861,6 +885,18 @@
          <!ELEMENT max-resource-size (#PCDATA)>
          PCDATA value: a numeric value (positive integer)
 
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 16]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Example:
 
          <C:max-resource-size xmlns:C="urn:ietf:params:xml:ns:caldav"
@@ -879,8 +915,8 @@
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:min-date-time is used to specify an iCalendar
       DATE-TIME value in UTC that indicates the earliest inclusive date
@@ -889,14 +925,6 @@
       collection.  Any attempt to store a calendar object resource using
       a date or time value earlier than this value MUST result in an
       error, with the CALDAV:min-date-time precondition
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 16]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
       (Section 5.3.2.1) being violated.  Note that servers MUST accept
       recurring components that specify instances beyond this limit,
       provided none of those instances have been overridden.  In that
@@ -916,6 +944,15 @@
          <C:min-date-time xmlns:C="urn:ietf:params:xml:ns:caldav"
          >19000101T000000Z</C:min-date-time>
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 17]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
 5.2.7.  CALDAV:max-date-time Property
 
    Name: max-date-time
@@ -929,8 +966,8 @@
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:max-date-time is used to specify an iCalendar
       DATE-TIME value in UTC that indicates the inclusive latest date
@@ -945,14 +982,6 @@
       simply ignore those instances outside of the acceptable range when
       processing reports on the calendar object resource.  In the
       absence of this property the client can assume any valid iCalendar
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 17]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
       date may be used at least down to the CALDAV:min-date-time value
       if that is defined.
 
@@ -968,6 +997,18 @@
 
 5.2.8.  CALDAV:max-instances Property
 
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 18]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Name: max-instances
 
    Namespace: urn:ietf:params:xml:ns:caldav
@@ -978,8 +1019,8 @@
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:max-instances is used to specify a numeric
       value that indicates the maximum number of recurrence instances
@@ -1001,14 +1042,6 @@
          <C:max-instances xmlns:C="urn:ietf:params:xml:ns:caldav"
          >100</C:max-instances>
 
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 18]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
 5.2.9.  CALDAV:max-attendees-per-instance Property
 
    Name: max-attendees-per-instance
@@ -1021,9 +1054,17 @@
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 19]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Description: The CALDAV:max-attendees-per-instance is used to specify
       a numeric value that indicates the maximum number of iCalendar
       ATTENDEE properties on any one instance of a calendar object
@@ -1048,23 +1089,13 @@
 
 5.2.10.  Additional Precondition for PROPPATCH
 
-   This specification requires an additional Precondition (see Section
-   16 of [I-D.ietf-webdav-rfc2518bis] for the PROPPATCH method.  The
-   precondition is:
+   This specification requires an additional Precondition for the
+   PROPPATCH method.  The precondition is:
 
       (CALDAV:valid-calendar-data): The time zone specified in CALDAV:
       calendar-timezone property MUST be a valid iCalendar object
       containing a single valid VTIMEZONE component.
 
-
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 19]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
 5.3.  Creating Resources
 
    The creation of calendar collections and calendar object resources
@@ -1082,6 +1113,14 @@
 
    An HTTP request using the MKCALENDAR method creates a new calendar
    collection resource.  A server MAY restrict calendar collection
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 20]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    creation to particular collections.
 
    Support for MKCALENDAR on the server is only RECOMMENDED and not
@@ -1113,19 +1152,11 @@
       If a request body is included, it MUST be a CALDAV:mkcalendar XML
       element.  Instruction processing MUST occur in the order
       instructions are received (i.e., from top to bottom).
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 20]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
       Instructions MUST either all be executed or none executed.  Thus
       if any error occurs during processing, all executed instructions
       MUST be undone and a proper error result returned.  Instruction
       processing details can be found in the definition of the DAV:set
-      instruction in Section 14.26 of [I-D.ietf-webdav-rfc2518bis].
+      instruction in Section 12.13.2 of [RFC2518].
 
          <!ELEMENT mkcalendar (DAV:set)>
 
@@ -1138,6 +1169,14 @@
 
    Preconditions:
 
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 21]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
       (DAV:resource-must-be-null): A resource MUST NOT exist at the
       Request-URI;
 
@@ -1169,14 +1208,6 @@
 
       207 (Multi-Status) - The calendar collection resource was not
       created since one or more DAV:set instructions specified in the
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 21]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
       request body could not be processed successfully.  The following
       are examples of response codes one would expect to be used in a
       207 (Multi-Status) response in this situation:
@@ -1193,6 +1224,15 @@
          failure of another DAV:set instruction specified in the request
          body;
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 22]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
          423 (Locked) - The specified resource is locked and the client
          either is not a lock owner or the lock type requires a lock
          token to be submitted and the client did not submit it; and
@@ -1228,9 +1268,25 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 22]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 23]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Request <<
@@ -1284,9 +1340,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 23]
+Daboo, et al.            Expires March 17, 2007                [Page 24]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Response <<
@@ -1340,9 +1396,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 24]
+Daboo, et al.            Expires March 17, 2007                [Page 25]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Request <<
@@ -1384,9 +1440,8 @@
 
 5.3.2.1.  Additional Preconditions for PUT, COPY and MOVE
 
-   This specification creates additional Preconditions (see Section 16
-   of [I-D.ietf-webdav-rfc2518bis] for PUT, COPY and MOVE methods.
-   These preconditions apply:
+   This specification creates additional Preconditions for PUT, COPY and
+   MOVE methods.  These preconditions apply:
 
       When a PUT operation of a calendar object resource into a calendar
       collection occurs.
@@ -1396,9 +1451,10 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 25]
+
+Daboo, et al.            Expires March 17, 2007                [Page 26]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    The new preconditions are:
@@ -1452,9 +1508,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 26]
+Daboo, et al.            Expires March 17, 2007                [Page 27]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
       instance) greater than or equal to the value of the CALDAV:min-
@@ -1508,9 +1564,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 27]
+Daboo, et al.            Expires March 17, 2007                [Page 28]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    A response to a GET request targeted at a calendar object resource
@@ -1559,14 +1615,14 @@
    The CALDAV:read-free-busy privilege controls which calendar
    collections, regular collections and calendar object resources are
    examined when a CALDAV:free-busy-query REPORT request is processed
-   (see Section 7.9).  This privilege can be granted on calendar
+   (see Section 7.10).  This privilege can be granted on calendar
    collections, regular collections or calendar object resources.
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 28]
+Daboo, et al.            Expires March 17, 2007                [Page 29]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    Servers MUST support this privilege on all calendar collections,
@@ -1598,11 +1654,10 @@
    Purpose: Identifies the URL of any WebDAV collections that contain
       calendar collections owned by the associated principal resource.
 
-   Conformance: This property MAY be defined in a principal resource.
+   Conformance: This property SHOULD be defined on a principal resource.
       If defined, it MAY be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).  Support for this property is
-      RECOMMENDED.
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:calendar-home-set property is meant to allow
       users to easily find the calendar collections owned by the
@@ -1620,9 +1675,10 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 29]
+
+Daboo, et al.            Expires March 17, 2007                [Page 30]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    Example:
@@ -1676,9 +1732,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 30]
+Daboo, et al.            Expires March 17, 2007                [Page 31]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
 7.3.  Date and floating time
@@ -1728,13 +1784,13 @@
    range, then the calendar object resource matches the filter element.
    The rules defined in [RFC2445] for determining the actual start and
    end times of calendar components MUST be used, and these are fully
-   enumerated in Section 9.8 of this document.
+   enumerated in Section 9.9 of this document.
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 31]
+Daboo, et al.            Expires March 17, 2007                [Page 32]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    When such time range filtering is used, special consideration must be
@@ -1744,30 +1800,118 @@
    If one or more recurrence instances overlap the time range, then the
    calendar object resource matches the filter element.
 
-7.5.  Partial Retrieval
+7.5.  Searching Text: Collations
 
+   Some of the reports defined in this section do text matches of
+   character strings provided by the client and compared to stored
+   calendar data.  Since iCalendar data is by default encoded in the
+   UTF-8 charset and may include characters outside of the US-ASCII
+   charset range in some property and parameter values, there is a need
+   to ensure that text matching follows well-defined rules.
+
+   To deal with this, this specification makes use of the IANA Collation
+   Registry defined in [I-D.newman-i18n-comparator] to specify
+   collations that may be used to carry out the text comparison
+   operations with a well-defined rule.
+
+   The comparisons used in CalDAV are all "substring" matches as per
+   [I-D.newman-i18n-comparator] Section 4.2.  Collations supported by
+   the server MUST support "substring" match operations.
+
+   CalDAV servers are REQUIRED to support the "i;ascii-casemap" and
+   "i;octet" collations as described in [I-D.newman-i18n-comparator],
+   and MAY support other collations.
+
+   Servers MUST advertise the set of collations that they support via
+   the CALDAV:supported-collation-set property defined on any resource
+   that supports reports that use collations.
+
+   Clients MUST only use collations from the list advertised by the
+   server.
+
+   In the absence of a collation explicitly specified by the client, or
+   if the client specifies the "default" collation identifier (as
+   defined in [I-D.newman-i18n-comparator] Section 3.1), the server MUST
+   default to using "i;ascii-casemap" as the collation.
+
+   Wildcards (as defined in [I-D.newman-i18n-comparator] Section 3.2)
+   MUST NOT be used in the collation identifier.
+
+   If the client chooses a collation not supported by the server, the
+   server MUST respond with a CALDAV:supported-collation precondition
+   error response.
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 33]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+7.5.1.  CALDAV:supported-collation-set Property
+
+   Name: supported-collation-set
+
+   Namespace: urn:ietf:params:xml:ns:caldav
+
+   Purpose: Identifies the set of collations supported by the server for
+      text matching operations.
+
+   Conformance: This property MUST be defined on any resource that
+      supports a REPORT that does text matching.  If defined, it MUST be
+      protected and SHOULD NOT be returned by a PROPFIND DAV:allprop
+      request (as defined in Section 12.14.1 of [RFC2518]).
+
+   Description: The CALDAV:supported-collation-set property contains
+      zero or more CALDAV:supported-collation elements which specify the
+      collection identifiers of the collations supported by the server.
+
+   Definition:
+
+         <!ELEMENT supported-collation-set (supported-collation*)>
+           <!ELEMENT supported-collation (#PCDATA)>
+
+   Example:
+
+       <C:supported-collation-set
+           xmlns:C="urn:ietf:params:xml:ns:caldav">
+         <C:supported-collation>i;ascii-casemap</C:supported-collation>
+         <C:supported-collation>i;octet</C:supported-collation>
+       </C:supported-collation-set>
+
+7.6.  Partial Retrieval
+
    Some calendaring REPORTs defined in this document allow partial
-   retrieval of calendar object resources.  A CalDAV client MAY specify
+   retrieval of calendar object resources.  A CalDAV client can specify
    what information to return in the body of a calendaring REPORT
    request.
 
-   A CalDAV client MAY request particular WebDAV property values, all
+   A CalDAV client can request particular WebDAV property values, all
    WebDAV property values, or a list of the names of the resource's
-   WebDAV properties.  A CalDAV client MAY also request calendar data to
+   WebDAV properties.  A CalDAV client can also request calendar data to
    be returned and whether all calendar components and properties should
    be returned or only particular ones.  See CALDAV:calendar-data in
-   Section 9.5.
+   Section 9.6.
 
    By default, the returned calendar data will include the component
    that defines the recurrence set, referred to as the "master
    component", as well as the components that define exceptions to the
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 34]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    recurrence set, referred to as the "overridden components".
 
    A CalDAV client only interested in the recurrence instances that
-   overlap a specified time range MAY request to receive only the
+   overlap a specified time range can request to receive only the
    "master component" along with the "overridden components" that impact
    the specified time range and thus limit the data returned by the
-   server.  See CALDAV:limit-recurrence-set in Section 9.5.6.  An
+   server.  See CALDAV:limit-recurrence-set in Section 9.6.6.  An
    overridden component impacts a time range if its current start and
    end times overlap the time range, or if the original start and end
    times - the ones that would have been used if the instance were not
@@ -1776,25 +1920,18 @@
    A CalDAV client with no support for recurrence properties (i.e.,
    EXDATE, EXRULE, RDATE and RRULE) and possibly VTIMEZONE components,
    or a client not willing to perform recurrence expansion because of
-   limited processing capability MAY request to receive only the
+   limited processing capability can request to receive only the
    recurrence instances that overlap a specified time range as separate
    calendar components that each define exactly one recurrence instance.
-   See CALDAV:expand in Section 9.5.5.
+   See CALDAV:expand in Section 9.6.5.
 
-   Finally, in the case of VFREEBUSY components, a CalDAV client MAY
+   Finally, in the case of VFREEBUSY components, a CalDAV client can
    request to receive only the FREEBUSY property values that overlap a
    specified time range.  See CALDAV:limit-freebusy-set in
-   Section 9.5.7.
+   Section 9.6.7.
 
+7.7.  Non-standard components, properties and parameters
 
-
-Daboo, et al.           Expires January 15, 2007               [Page 32]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
-7.6.  Non-standard components, properties and parameters
-
    Servers MUST support the use of non-standard component, property or
    parameter names in the CALDAV:calendar-data XML element in
    calendaring REPORT requests to allow clients to request that non-
@@ -1812,10 +1949,18 @@
    non-standard component, property or parameter name which the server
    does not support queries on.
 
-7.7.  CALDAV:calendar-query Report
+7.8.  CALDAV:calendar-query Report
 
    The CALDAV:calendar-query REPORT performs a search for all calendar
    object resources that match a specified filter.  The response of this
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 35]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    REPORT will contain all the WebDAV properties and calendar object
    resource data specified in the request.  In the case of the CALDAV:
    calendar-data XML element, one can explicitly specify the calendar
@@ -1838,17 +1983,8 @@
    Marshalling:
 
       The request body MUST be a CALDAV:calendar-query XML element as
-      defined in Section 9.4.
+      defined in Section 9.5.
 
-
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 33]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
       The request MAY include a Depth header.  If no Depth header is
       included, Depth:0 is assumed.
 
@@ -1868,20 +2004,28 @@
 
       (CALDAV:supported-calendar-data): The attributes "content-type"
       and "version" of the CALDAV:calendar-data XML element (see
-      Section 9.5) specify a media type supported by the server for
+      Section 9.6) specify a media type supported by the server for
       calendar object resources.
 
       (CALDAV:valid-filter): The CALDAV:filter XML element (see
-      Section 9.6) specified in the REPORT request MUST be valid.  For
+      Section 9.7) specified in the REPORT request MUST be valid.  For
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 36]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
       instance, a CALDAV:filter cannot nest a <C:comp name="VEVENT">
       element in a <C:comp name="VTODO"> element, or a CALDAV:filter
       cannot nest a <C:time-range start="..." end="..."> element in a
       <C:prop name="SUMMARY"> element.
 
       (CALDAV:supported-filter): The CALDAV:comp-filter (see
-      Section 9.6.1), CALDAV:prop-filter (see Section 9.6.2) and CALDAV:
-      param-filter (see Section 9.6.3) XML elements used in the CALDAV:
-      filter XML element (see Section 9.6) in the REPORT request only
+      Section 9.7.1), CALDAV:prop-filter (see Section 9.7.2) and CALDAV:
+      param-filter (see Section 9.7.3) XML elements used in the CALDAV:
+      filter XML element (see Section 9.7) in the REPORT request only
       make reference to components, properties and parameters for which
       queries are supported by the server. i.e., if the CALDAV:filter
       element attempts to reference an unsupported component, property
@@ -1897,14 +2041,6 @@
       REPORT request MUST be a valid iCalendar object containing a
       single valid VTIMEZONE component.
 
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 34]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
       (CALDAV:min-date-time): Any XML element specifying a range of time
       MUST have its start or end date or time values greater than or
       equal to the value of the CALDAV:min-date-time property value
@@ -1917,6 +2053,10 @@
       (Section 5.2.7) on the calendar collections being targeted by the
       REPORT;
 
+      (CALDAV:supported-collation): Any XML attribute specifying a
+      collation MUST specify a collation supported by the server as
+      described in Section 7.5.
+
    Postconditions:
 
       (DAV:number-of-matches-within-limits): The number of matching
@@ -1925,8 +2065,16 @@
       if a search specification would cause the return of an extremely
       large number of responses.
 
-7.7.1.  Example: Partial retrieval of events by time range
 
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 37]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+7.8.1.  Example: Partial retrieval of events by time range
+
    In this example, the client requests the server to return specific
    components and properties of the VEVENT components that overlap the
    time range from January 4th, 2006 at 00:00:00 AM UTC to January 5th,
@@ -1956,9 +2104,29 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 35]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 38]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Request <<
@@ -2012,9 +2180,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 36]
+Daboo, et al.            Expires March 17, 2007                [Page 39]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    <?xml version="1.0" encoding="utf-8" ?>
@@ -2068,9 +2236,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 37]
+Daboo, et al.            Expires March 17, 2007                [Page 40]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    END:VEVENT
@@ -2124,12 +2292,12 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 38]
+Daboo, et al.            Expires March 17, 2007                [Page 41]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-7.7.2.  Example: Partial retrieval of recurring events
+7.8.2.  Example: Partial retrieval of recurring events
 
    In this example, the client requests the server to return VEVENT
    components that overlap the time range from January 3rd, 2006 at 00:
@@ -2180,9 +2348,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 39]
+Daboo, et al.            Expires March 17, 2007                [Page 42]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    <?xml version="1.0" encoding="utf-8" ?>
@@ -2236,9 +2404,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 40]
+Daboo, et al.            Expires March 17, 2007                [Page 43]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
          <D:status>HTTP/1.1 200 OK</D:status>
@@ -2292,15 +2460,15 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 41]
+Daboo, et al.            Expires March 17, 2007                [Page 44]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
      </D:response>
    </D:multistatus>
 
-7.7.3.  Example: Expanded retrieval of recurring events
+7.8.3.  Example: Expanded retrieval of recurring events
 
    In this example, the client requests the server to return VEVENT
    components that overlap the time range from January 2nd, 2006 at 00:
@@ -2348,9 +2516,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 42]
+Daboo, et al.            Expires March 17, 2007                [Page 45]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    <?xml version="1.0" encoding="utf-8" ?>
@@ -2404,9 +2572,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 43]
+Daboo, et al.            Expires March 17, 2007                [Page 46]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    ORGANIZER:mailto:cyrus at example.com
@@ -2424,7 +2592,7 @@
      </D:response>
    </D:multistatus>
 
-7.7.4.  Example: Partial retrieval of stored free busy components
+7.8.4.  Example: Partial retrieval of stored free busy components
 
    In this example, the client requests the server to return the
    VFREEBUSY components that have free busy information that overlap the
@@ -2460,9 +2628,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 44]
+Daboo, et al.            Expires March 17, 2007                [Page 47]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Request <<
@@ -2516,9 +2684,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 45]
+Daboo, et al.            Expires March 17, 2007                [Page 48]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Response <<
@@ -2555,7 +2723,7 @@
      </D:response>
    </D:multistatus>
 
-7.7.5.  Example: Retrieval of to-dos by alarm time range
+7.8.5.  Example: Retrieval of to-dos by alarm time range
 
    In this example, the client requests the server to return the VTODO
    components that have an alarm trigger scheduled in the specified time
@@ -2572,9 +2740,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 46]
+Daboo, et al.            Expires March 17, 2007                [Page 49]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Request <<
@@ -2628,9 +2796,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 47]
+Daboo, et al.            Expires March 17, 2007                [Page 50]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Response <<
@@ -2672,7 +2840,7 @@
      </D:response>
    </D:multistatus>
 
-7.7.6.  Example: Retrieval of event by UID
+7.8.6.  Example: Retrieval of event by UID
 
    In this example, the client requests the server to return the VEVENT
    component that has the UID property set to
@@ -2684,9 +2852,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 48]
+Daboo, et al.            Expires March 17, 2007                [Page 51]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Request <<
@@ -2707,8 +2875,8 @@
        <C:comp-filter name="VCALENDAR">
          <C:comp-filter name="VEVENT">
            <C:prop-filter name="UID">
-             <C:text-match caseless="no">
-              DC6C50A017428C5216A2F1CD at example.com</C:text-match>
+             <C:text-match collation="i;octet"
+             >DC6C50A017428C5216A2F1CD at example.com</C:text-match>
            </C:prop-filter>
          </C:comp-filter>
        </C:comp-filter>
@@ -2740,9 +2908,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 49]
+Daboo, et al.            Expires March 17, 2007                [Page 52]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    DTSTART:20000404T020000
@@ -2781,7 +2949,7 @@
      </D:response>
    </D:multistatus>
 
-7.7.7.  Example: Retrieval of events by PARTSTAT
+7.8.7.  Example: Retrieval of events by PARTSTAT
 
    In this example, the client requests the server to return the VEVENT
    components that have the ATTENDEE property with the value
@@ -2796,9 +2964,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 50]
+Daboo, et al.            Expires March 17, 2007                [Page 53]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Request <<
@@ -2819,10 +2987,11 @@
        <C:comp-filter name="VCALENDAR">
          <C:comp-filter name="VEVENT">
            <C:prop-filter name="ATTENDEE">
-             <C:text-match
-               caseless="yes">mailto:lisa at example.com</C:text-match>
+             <C:text-match collation="i;ascii-casemap"
+              >mailto:lisa at example.com</C:text-match>
              <C:param-filter name="PARTSTAT">
-               <C:text-match caseless="yes">NEEDS-ACTION</C:text-match>
+               <C:text-match collation="i;ascii-casemap"
+                >NEEDS-ACTION</C:text-match>
              </C:param-filter>
            </C:prop-filter>
          </C:comp-filter>
@@ -2848,15 +3017,15 @@
            <C:calendar-data>BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
-   BEGIN:VTIMEZONE
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 51]
+Daboo, et al.            Expires March 17, 2007                [Page 54]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
+   BEGIN:VTIMEZONE
    LAST-MODIFIED:20040110T032845Z
    TZID:US/Eastern
    BEGIN:DAYLIGHT
@@ -2896,7 +3065,7 @@
      </D:response>
    </D:multistatus>
 
-7.7.8.  Example: Retrieval of events only
+7.8.8.  Example: Retrieval of events only
 
    In this example, the client requests the server to return all VEVENT
    components.
@@ -2907,10 +3076,9 @@
 
 
 
-
-Daboo, et al.           Expires January 15, 2007               [Page 52]
+Daboo, et al.            Expires March 17, 2007                [Page 55]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Request <<
@@ -2964,9 +3132,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 53]
+Daboo, et al.            Expires March 17, 2007                [Page 56]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    END:DAYLIGHT
@@ -3020,9 +3188,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 54]
+Daboo, et al.            Expires March 17, 2007                [Page 57]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    END:VTIMEZONE
@@ -3076,9 +3244,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 55]
+Daboo, et al.            Expires March 17, 2007                [Page 58]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    END:DAYLIGHT
@@ -3112,7 +3280,7 @@
      </D:response>
    </D:multistatus>
 
-7.7.9.  Example: Retrieval of all pending to-dos
+7.8.9.  Example: Retrieval of all pending to-dos
 
    In this example, the client requests the server to return all VTODO
    components that do not include a "COMPLETED" property and do not have
@@ -3132,9 +3300,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 56]
+Daboo, et al.            Expires March 17, 2007                [Page 59]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    >> Request <<
@@ -3188,9 +3356,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 57]
+Daboo, et al.            Expires March 17, 2007                [Page 60]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    DTSTAMP:20060205T235335Z
@@ -3244,12 +3412,12 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 58]
+Daboo, et al.            Expires March 17, 2007                [Page 61]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-7.7.10.  Example: Attempt to query unsupported property
+7.8.10.  Example: Attempt to query unsupported property
 
    In this example, the client requests the server to return all VEVENT
    components that include an "X-ABC-GUID" property with a value
@@ -3300,19 +3468,19 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 59]
+Daboo, et al.            Expires March 17, 2007                [Page 62]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-7.8.  CALDAV:calendar-multiget Report
+7.9.  CALDAV:calendar-multiget Report
 
    The CALDAV:calendar-multiget REPORT is used to retrieve specific
    calendar object resources from within a collection, if the Request-
    URI is a collection, or to retrieve a specific calendar object
    resource, if the Request-URI is a calendar object resource.  This
    REPORT is similar to the CALDAV:calendar-query REPORT (see
-   Section 7.7), except that it takes a list of DAV:href elements
+   Section 7.8), except that it takes a list of DAV:href elements
    instead of a CALDAV:filter element to determine which calendar object
    resources to return.
 
@@ -3321,7 +3489,7 @@
    Marshalling:
 
       The request body MUST be a CALDAV:calendar-multiget XML element
-      (see Section 9.9).  If the Request-URI is a collection resource,
+      (see Section 9.10).  If the Request-URI is a collection resource,
       then the DAV:href elements MUST refer to calendar object resources
       within that collection, and they MAY refer to calendar object
       resources at any depth within the collection.  As a result the
@@ -3348,7 +3516,7 @@
 
       (CALDAV:supported-calendar-data): The attributes "content-type"
       and "version" of the CALDAV:calendar-data XML elements (see
-      Section 9.5) specify a media type supported by the server for
+      Section 9.6) specify a media type supported by the server for
       calendar object resources.
 
       (CALDAV:min-date-time): Any XML element specifying a range of time
@@ -3356,9 +3524,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 60]
+Daboo, et al.            Expires March 17, 2007                [Page 63]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
       equal to the value of the CALDAV:min-date-time property value
@@ -3375,7 +3543,7 @@
 
       None.
 
-7.8.1.  Example: Successful CALDAV:calendar-multiget Report
+7.9.1.  Example: Successful CALDAV:calendar-multiget Report
 
    In this example, the client requests the server to return specific
    properties of the VEVENT components referenced by specific URIs.  In
@@ -3412,9 +3580,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 61]
+Daboo, et al.            Expires March 17, 2007                [Page 64]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    Content-Length: xxxx
@@ -3468,15 +3636,15 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 62]
+Daboo, et al.            Expires March 17, 2007                [Page 65]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
      </D:response>
    </D:multistatus>
 
-7.9.  CALDAV:free-busy-query Report
+7.10.  CALDAV:free-busy-query Report
 
    The CALDAV:free-busy-query REPORT generates a VFREEBUSY component
    containing free busy information for all the calendar object
@@ -3524,16 +3692,16 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 63]
+Daboo, et al.            Expires March 17, 2007                [Page 66]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    Marshalling:
 
       The request body MUST be a CALDAV:free-busy-query XML element (see
-      Section 9.10, which MUST contain exactly one CALDAV:time-range XML
-      element, as defined in Section 9.8.
+      Section 9.11, which MUST contain exactly one CALDAV:time-range XML
+      element, as defined in Section 9.9.
 
       The request MAY include a Depth header.  If no Depth header is
       included, Depth:0 is assumed.
@@ -3580,12 +3748,12 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 64]
+Daboo, et al.            Expires March 17, 2007                [Page 67]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-7.9.1.  Example: Successful CALDAV:free-busy-query Report
+7.10.1.  Example: Successful CALDAV:free-busy-query Report
 
    In this example, the client requests the server to return free busy
    information on the calendar collection /bernard/work/, between 9:00
@@ -3636,9 +3804,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 65]
+Daboo, et al.            Expires March 17, 2007                [Page 68]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
 8.1.  Client-to-client Interoperability
@@ -3692,9 +3860,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 66]
+Daboo, et al.            Expires March 17, 2007                [Page 69]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    and the future up to a reasonable limit (e.g., one week, one month).
@@ -3748,9 +3916,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 67]
+Daboo, et al.            Expires March 17, 2007                [Page 70]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    REPORT /bernard/work/ HTTP/1.1
@@ -3804,9 +3972,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 68]
+Daboo, et al.            Expires March 17, 2007                [Page 71]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
 8.2.2.  Restrict the Properties Returned
@@ -3860,9 +4028,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 69]
+Daboo, et al.            Expires March 17, 2007                [Page 72]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    The choice of HTTP URLs means that calendar object resources are
@@ -3879,7 +4047,7 @@
    calendar in the same repository, that calendar can be found by using
    the principal namespace required by WebDAV ACL support.  For other
    cases, the authors have no universal solution but implementers can
-   consider whether to use vCard [RFC2426] or LDAP [RFC2251] standards
+   consider whether to use vCard [RFC2426] or LDAP [RFC4511] standards
    together with calendar attributes [RFC2739].
 
    Because CalDAV requires servers to support WebDAV ACL [RFC3744]
@@ -3916,9 +4084,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 70]
+Daboo, et al.            Expires March 17, 2007                [Page 73]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    <?xml version="1.0" encoding="utf-8" ?>
@@ -3972,9 +4140,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 71]
+Daboo, et al.            Expires March 17, 2007                [Page 74]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
       attachment is unchanged.
@@ -3986,9 +4154,8 @@
    directly, or by passing the attachment URI to a suitable "helper
    application" for processing, if such an application exists.  CalDAV
    clients MUST support downloading of external attachments referenced
-   by the "http" URI scheme, and MAY support downloading of external
-   attachments referenced by the "https" URI scheme.  An external
-   attachment could be:
+   by the "http" or "https" URI schemes.  An external attachment could
+   be:
 
    o  In a collection in the calendar collection containing the calendar
       object resource;
@@ -4025,15 +4192,15 @@
    Also, clients are responsible for consistency of permissions when
    using external attachments.  One reason for servers to support the
    storage of attachments within child collections of calendar
+   collections is that ACL inheritance might make it easier to grant the
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 72]
+Daboo, et al.            Expires March 17, 2007                [Page 75]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-   collections is that ACL inheritance might make it easier to grant the
    same permissions to attachments that are granted on the calendar
    collection.  Otherwise, it can be very difficult to keep permissions
    synchronized.  With attachments stored on separate repositories, it
@@ -4081,15 +4248,15 @@
    Clients that allow changes to calendar object resources MUST
    synchronize the alarm data that already exists in the resources.
    Clients MAY execute alarms that are downloaded in this fashion,
+   possibly based on user preference.  If a client is only doing read
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 73]
+Daboo, et al.            Expires March 17, 2007                [Page 76]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-   possibly based on user preference.  If a client is only doing read
    operations on a calendar and there is no risk of losing alarm
    information, then the client MAY discard alarm information.
 
@@ -4140,9 +4307,10 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 74]
+
+Daboo, et al.            Expires March 17, 2007                [Page 77]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    Name: mkcalendar-response
@@ -4158,15 +4326,32 @@
 
          <!ELEMENT mkcalendar-response ANY>
 
-9.4.  CALDAV:calendar-query XML Element
+9.4.  CALDAV:supported-collation XML Element
 
+   Name: supported-collation
+
+   Namespace: urn:ietf:params:xml:ns:caldav
+
+   Purpose: Identifies a single collation via its collation identifier
+      as defined by [I-D.newman-i18n-comparator].
+
+   Description: The CALDAV:supported-collation contains the text of a
+      collation identifier as described in Section 7.5.1.
+
+   Definition:
+
+         <!ELEMENT supported-collation (#PCDATA)>
+         PCDATA value: collation identifier
+
+9.5.  CALDAV:calendar-query XML Element
+
    Name: calendar-query
 
    Namespace: urn:ietf:params:xml:ns:caldav
 
    Purpose: Defines a REPORT for querying calendar object resources.
 
-   Description: See Section 7.7.
+   Description: See Section 7.8.
 
    Definition:
 
@@ -4174,8 +4359,18 @@
                                     DAV:propname |
                                     DAV:prop)?, filter, timezone?)>
 
-9.5.  CALDAV:calendar-data XML Element
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 78]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+9.6.  CALDAV:calendar-data XML Element
+
    Name: calendar-data
 
    Namespace: urn:ietf:params:xml:ns:caldav
@@ -4191,16 +4386,6 @@
       property, the CALDAV:calendar-data XML element specifies a media
       type supported by the CalDAV server for calendar object resources.
 
-
-
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 75]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
       When used in a calendaring REPORT request, the CALDAV:calendar-
       data XML element specifies which parts of calendar object
       resources need to be returned in the response.  If the CALDAV:
@@ -4230,8 +4415,16 @@
    Note: The iCalendar data embedded within the CALDAV:calendar-data XML
       element MUST follow the standard XML character data encoding
       rules, including use of &lt;, &gt;, &amp; etc entity encoding or
-      the use of a <[!CDATA[ ... ]]> construct.  In the later case the
+      the use of a <![CDATA[ ... ]]> construct.  In the later case the
       iCalendar data cannot contain the character sequence "]]>" which
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 79]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
       is the end delimiter for the CDATA section.
 
    Definition:
@@ -4247,18 +4440,8 @@
          content-type value: a MIME media type
          version value: a version string
 
+9.6.1.  CALDAV:comp XML Element
 
-
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 76]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
-9.5.1.  CALDAV:comp XML Element
-
    Name: comp
 
    Namespace: urn:ietf:params:xml:ns:caldav
@@ -4276,17 +4459,28 @@
          name value: a calendar component name
 
    Note: The CALDAV:prop and CALDAV:allprop elements have the same name
-      as the DAV:prop and DAV:allprop elements defined in [I-D.ietf-
-      webdav-rfc2518bis].  However, the CALDAV:prop and CALDAV:allprop
-      element are defined in the "urn:ietf:params:xml:ns:caldav"
-      namespace instead of the "DAV:" namespace.
+      as the DAV:prop and DAV:allprop elements defined in [RFC2518].
+      However, the CALDAV:prop and CALDAV:allprop element are defined in
+      the "urn:ietf:params:xml:ns:caldav" namespace instead of the
+      "DAV:" namespace.
 
-9.5.2.  CALDAV:allcomp XML Element
+9.6.2.  CALDAV:allcomp XML Element
 
    Name: allcomp
 
    Namespace: urn:ietf:params:xml:ns:caldav
 
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 80]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Purpose: Specifies that all components shall be returned.
 
    Description: The CALDAV:allcomp XML element can be used when the
@@ -4297,22 +4491,12 @@
 
          <!ELEMENT allcomp EMPTY>
 
-9.5.3.  CALDAV:allprop XML Element
+9.6.3.  CALDAV:allprop XML Element
 
    Name: allprop
 
    Namespace: urn:ietf:params:xml:ns:caldav
 
-
-
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 77]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
    Purpose: Specifies that all properties shall be returned.
 
    Description: The CALDAV:allprop XML element can be used when the
@@ -4324,12 +4508,11 @@
          <!ELEMENT allprop EMPTY>
 
    Note: The CALDAV:allprop element has the same name as the DAV:allprop
-      element defined in [I-D.ietf-webdav-rfc2518bis].  However, the
-      CALDAV:allprop element is defined in the
-      "urn:ietf:params:xml:ns:caldav" namespace instead of the "DAV:"
-      namespace.
+      element defined in [RFC2518].  However, the CALDAV:allprop element
+      is defined in the "urn:ietf:params:xml:ns:caldav" namespace
+      instead of the "DAV:" namespace.
 
-9.5.4.  CALDAV:prop XML Element
+9.6.4.  CALDAV:prop XML Element
 
    Name: prop
 
@@ -4345,6 +4528,15 @@
       property name and any iCalendar parameters and a trailing ":"
       without the subsequent value data.
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 81]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Definition:
 
          <!ELEMENT prop EMPTY>
@@ -4355,22 +4547,12 @@
          novalue value: "yes" or "no"
 
    Note: The CALDAV:prop element has the same name as the DAV:prop
-      element defined in [I-D.ietf-webdav-rfc2518bis].  However, the
-      CALDAV:prop element is defined in the
-      "urn:ietf:params:xml:ns:caldav" namespace instead of the "DAV:"
-      namespace.
+      element defined in [RFC2518].  However, the CALDAV:prop element is
+      defined in the "urn:ietf:params:xml:ns:caldav" namespace instead
+      of the "DAV:" namespace.
 
+9.6.5.  CALDAV:expand XML Element
 
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 78]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
-9.5.5.  CALDAV:expand XML Element
-
    Name: expand
 
    Namespace: urn:ietf:params:xml:ns:caldav
@@ -4399,6 +4581,18 @@
 
    Definition:
 
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 82]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
          <!ELEMENT expand EMPTY>
 
          <!ATTLIST expand start CDATA #REQUIRED
@@ -4406,7 +4600,7 @@
          start value: an iCalendar "date with UTC time"
          end value: an iCalendar "date with UTC time"
 
-9.5.6.  CALDAV:limit-recurrence-set XML Element
+9.6.6.  CALDAV:limit-recurrence-set XML Element
 
    Name: limit-recurrence-set
 
@@ -4415,16 +4609,6 @@
    Purpose: Specifies a time range to limit the set of "overridden
       components" returned by the server.
 
-
-
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 79]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
    Description: The CALDAV:limit-recurrence-set XML element specifies
       that for a given calendaring REPORT request the server MUST
       return, in addition to the "master component", only the
@@ -4458,8 +4642,15 @@
          start value: an iCalendar "date with UTC time"
          end value: an iCalendar "date with UTC time"
 
-9.5.7.  CALDAV:limit-freebusy-set XML Element
 
+
+Daboo, et al.            Expires March 17, 2007                [Page 83]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+9.6.7.  CALDAV:limit-freebusy-set XML Element
+
    Name: limit-freebusy-set
 
    Namespace: urn:ietf:params:xml:ns:caldav
@@ -4473,14 +4664,6 @@
       intersect a specified time range.  The "start" attribute specifies
       the inclusive start of the time range, and the "end" attribute
       specifies the non-inclusive end of the time range.  Both
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 80]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
       attributes are specified as "date with UTC time" value.  The value
       of the "end" attribute MUST be greater than the value of the
       "start" attribute.  The server MUST use the same logic as defined
@@ -4496,7 +4679,7 @@
          start value: an iCalendar "date with UTC time"
          end value: an iCalendar "date with UTC time"
 
-9.6.  CALDAV:filter XML Element
+9.7.  CALDAV:filter XML Element
 
    Name: filter
 
@@ -4513,8 +4696,17 @@
 
          <!ELEMENT filter (comp-filter)>
 
-9.6.1.  CALDAV:comp-filter XML Element
 
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 84]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+9.7.1.  CALDAV:comp-filter XML Element
+
    Name: comp-filter
 
    Namespace: urn:ietf:params:xml:ns:caldav
@@ -4529,14 +4721,6 @@
          exists, and the CALDAV:comp-filter is empty, or it contains at
          least one recurrence instance scheduled to overlap a given time
          range if a CALDAV:time-range XML element is specified, and that
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 81]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
          any CALDAV:prop-filter and CALDAV:comp-filter child elements
          also match.
 
@@ -4553,7 +4737,7 @@
          <!ATTLIST comp-filter name CDATA #REQUIRED>
          name value: a calendar component name (e.g., "VEVENT")
 
-9.6.2.  CALDAV:prop-filter XML Element
+9.7.2.  CALDAV:prop-filter XML Element
 
    Name: prop-filter
 
@@ -4569,6 +4753,14 @@
       *  A property of the type specified by the "name" attribute
          exists, and the CALDAV:prop-filter is empty, or it matches the
          CALDAV:time-range XML element or CALDAV:text-match conditions
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 85]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
          if specified, and that any CALDAV:param-filter child elements
          also match.
 
@@ -4586,15 +4778,8 @@
          <!ATTLIST prop-filter name CDATA #REQUIRED>
          name value: a calendar property name (e.g., "ATTENDEE")
 
+9.7.3.  CALDAV:param-filter XML Element
 
-
-Daboo, et al.           Expires January 15, 2007               [Page 82]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
-9.6.3.  CALDAV:param-filter XML Element
-
    Name: param-filter
 
    Namespace: urn:ietf:params:xml:ns:caldav
@@ -4622,8 +4807,18 @@
          <!ATTLIST param-filter name CDATA #REQUIRED>
          name value: a property parameter name (e.g., "PARTSTAT")
 
-9.6.4.  CALDAV:is-not-defined XML Element
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 86]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+9.7.4.  CALDAV:is-not-defined XML Element
+
    Name: is-not-defined
 
    Namespace: urn:ietf:params:xml:ns:caldav
@@ -4640,17 +4835,8 @@
 
          <!ELEMENT is-not-defined EMPTY>
 
+9.7.5.  CALDAV:text-match XML Element
 
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 83]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
-9.6.5.  CALDAV:text-match XML Element
-
    Name: text-match
 
    Namespace: urn:ietf:params:xml:ns:caldav
@@ -4662,17 +4848,10 @@
       for a substring match against the property or parameter value
       specified in a calendaring REPORT request.
 
-      The "caseless" attribute indicates whether the match is case-
-      sensitive (value set to "no") or case-insensitive (value set to
-      "yes").  The default value is server-specified.  Support for the
-      "caseless" attribute is REQUIRED, and implementers of servers are
-      strongly encouraged to consult "The Unicode Standard" [UNICODE4],
-      especially Section 5.18, Subsection "Caseless Matching", for
-      guidance when implementing their case-insensitive matching
-      algorithms.  A server MAY ignore the caseless attribute when
-      applied to enumerated iCalendar property or parameter values, and
-      default to caseless matching for those values, since they are
-      defined as being case-insensitive in iCalendar.
+      The "collation" attribute is used to select the collation that the
+      server MUST use for character string matching.  In the absence of
+      this attribute the server MUST use the "i;ascii-casemap"
+      collation.
 
       The "negate-condition" attribute is used to indicate that this
       test returns a match if the text matches, when the attribute value
@@ -4683,28 +4862,29 @@
 
    Definition:
 
-         <!ELEMENT text-match (#PCDATA)>
-         PCDATA value: string
 
-         <!ATTLIST text-match caseless         (yes | no) #IMPLIED
-                              negate-condition (yes | no) "no">
 
-9.7.  CALDAV:timezone XML Element
 
-   Name: timezone
 
-   Namespace: urn:ietf:params:xml:ns:caldav
 
 
+Daboo, et al.            Expires March 17, 2007                [Page 87]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
+         <!ELEMENT text-match (#PCDATA)>
+         PCDATA value: string
 
+         <!ATTLIST text-match collation        CDATA "i;ascii-casemap"
+                              negate-condition (yes | no) "no">
 
-Daboo, et al.           Expires January 15, 2007               [Page 84]
-
-Internet-Draft                   CalDAV                        July 2006
+9.8.  CALDAV:timezone XML Element
 
+   Name: timezone
 
+   Namespace: urn:ietf:params:xml:ns:caldav
+
    Purpose: Specifies the time zone component to use when determining
       the results of a report.
 
@@ -4722,7 +4902,7 @@
    Note: The iCalendar data embedded within the CALDAV:timezone XML
       element MUST follow the standard XML character data encoding
       rules, including use of &lt;, &gt;, &amp; etc entity encoding or
-      the use of a <[!CDATA[ ... ]]> construct.  In the later case the
+      the use of a <![CDATA[ ... ]]> construct.  In the later case the
       iCalendar data cannot contain the character sequence "]]>" which
       is the end delimiter for the CDATA section.
 
@@ -4731,7 +4911,7 @@
          <!ELEMENT timezone (#PCDATA)>
          PCDATA value: an iCalendar object with exactly one VTIMEZONE
 
-9.8.  CALDAV:time-range XML Element
+9.9.  CALDAV:time-range XML Element
 
    Name: time-range
 
@@ -4740,6 +4920,15 @@
    Purpose: Specifies a time range to limit the set of calendar
       components returned by the server.
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 88]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Description: The CALDAV:time-range XML element specifies that for a
       given calendaring REPORT request the server MUST only return the
       calendar object resources that, depending on the context, have a
@@ -4753,14 +4942,6 @@
       If either the "start" or "end" attribute is not specified in the
       CALDAV:time-range XML element, assume "-infinity" and "+infinity"
       as their value respectively.  If both "start" and "end" are
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 85]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
       present, the value of the "end" attribute MUST be greater than the
       value of the "start" attribute.
 
@@ -4782,6 +4963,28 @@
       properties is 1 day (+P1D) when the DTSTART is a DATE value, and 0
       seconds when the DTSTART is a DATE-TIME value.
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 89]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
       +---------------------------------------------------------------+
       | VEVENT has the DTEND property?                                |
       |   +-----------------------------------------------------------+
@@ -4809,17 +5012,35 @@
       table below is satisfied.  The conditions depend on the presence
       of the DTSTART, DURATION, DUE, COMPLETED and CREATED properties in
       the VTODO component.  Note that as specified in [RFC2445] the DUE
+      value MUST be a DATE-TIME value equal to or after the DTSTART
+      value, if specified.
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 86]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 90]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-      value MUST be a DATE-TIME value equal to or after the DTSTART
-      value, if specified.
-
    +-------------------------------------------------------------------+
    | VTODO has the DTSTART property?                                   |
    |   +---------------------------------------------------------------+
@@ -4868,9 +5089,12 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 87]
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 91]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
       +----------------------------------------------------+
@@ -4924,9 +5148,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 88]
+Daboo, et al.            Expires March 17, 2007                [Page 92]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
       A VALARM component is said to overlap a given time range if the
@@ -4963,7 +5187,7 @@
          start value: an iCalendar "date with UTC time"
          end value: an iCalendar "date with UTC time"
 
-9.9.  CALDAV:calendar-multiget XML Element
+9.10.  CALDAV:calendar-multiget XML Element
 
    Name: calendar-multiget
 
@@ -4972,7 +5196,7 @@
    Purpose: CalDAV REPORT used to retrieve specific calendar object
       resources.
 
-   Description: See Section 7.8.
+   Description: See Section 7.9.
 
 
 
@@ -4980,9 +5204,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 89]
+Daboo, et al.            Expires March 17, 2007                [Page 93]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    Definition:
@@ -4991,7 +5215,7 @@
                                       DAV:propname |
                                       DAV:prop)?, DAV:href+)>
 
-9.10.  CALDAV:free-busy-query XML Element
+9.11.  CALDAV:free-busy-query XML Element
 
    Name: free-busy-query
 
@@ -5000,7 +5224,7 @@
    Purpose: CalDAV REPORT used to generate a VFREEBUSY to determine busy
       time over a specific time range.
 
-   Description: See Section 7.9.
+   Description: See Section 7.10.
 
    Definition:
 
@@ -5012,10 +5236,10 @@
    CalDAV allows internationalized strings to be stored and retrieved
    for the description of calendar collections (see Section 5.2.1).
 
-   The CALDAV:calendar-query report (Section 7.7) includes a text
+   The CALDAV:calendar-query report (Section 7.8) includes a text
    searching option controlled by the CALDAV:text-match element and
    details of character handling are covered in the description of that
-   element (see Section 9.6.5).
+   element (see Section 9.7.5).
 
 
 11.  Security Considerations
@@ -5036,9 +5260,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 90]
+Daboo, et al.            Expires March 17, 2007                [Page 94]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    When creating new resources (including calendar collections), clients
@@ -5067,8 +5291,8 @@
    [RFC2446] are also applicable to CalDAV.
 
    Beyond these, CalDAV does not raise any security considerations that
-   are not present in HTTP [RFC2616] and WebDAV [I-D.ietf-webdav-
-   rfc2518bis], [RFC3253], [RFC3744], as discussed in those documents.
+   are not present in HTTP [RFC2616] and WebDAV [RFC2518], [RFC3253],
+   [RFC3744], as discussed in those documents.
 
 
 12.  IANA Consideration
@@ -5092,9 +5316,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 91]
+Daboo, et al.            Expires March 17, 2007                [Page 95]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
 13.  Acknowledgements
@@ -5102,9 +5326,10 @@
    The authors would like to thank the following individuals for
    contributing their ideas and support for writing this specification:
    Michael Arick, Mario Bonin, Chris Bryant, Scott Carr, Mike Douglass,
-   Helge Hess, Dan Mosedale, Kervin L. Pierre, Julian F. Reschke, Mike
-   Shaver, Simon Vaillancourt, Wilfredo Sanchez and Jim Whitehead,
-   Alexey Melnikov, Jeff McCullough, Brian Moseley, Jari Urpalainen.
+   Ted Hardie, Sam Hartman, Helge Hess, Jeff McCullough, Alexey
+   Melnikov, Dan Mosedale, Brian Moseley, Kervin L. Pierre, Julian F.
+   Reschke, Wilfredo Sanchez Vega, Mike Shaver, Jari Urpalainen, Simon
+   Vaillancourt, Jim Whitehead.
 
    The authors would also like to thank the Calendaring and Scheduling
    Consortium for advice with this specification, and for organizing
@@ -5115,10 +5340,10 @@
 
 14.1.  Normative References
 
-   [I-D.ietf-webdav-rfc2518bis]
-              Dusseault, L., "HTTP Extensions for Distributed Authoring
-              - WebDAV", draft-ietf-webdav-rfc2518bis-15 (work in
-              progress), May 2006.
+   [I-D.newman-i18n-comparator]
+              Newman, C., "Internet Application Protocol Collation
+              Registry", draft-newman-i18n-comparator-13 (work in
+              progress), August 2006.
 
    [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
               Requirement Levels", BCP 14, RFC 2119, March 1997.
@@ -5135,24 +5360,28 @@
               (iTIP) Scheduling Events, BusyTime, To-dos and Journal
               Entries", RFC 2446, November 1998.
 
+   [RFC2518]  Goland, Y., Whitehead, E., Faizi, A., Carter, S., and D.
+              Jensen, "HTTP Extensions for Distributed Authoring --
+              WEBDAV", RFC 2518, February 1999.
+
    [RFC2616]  Fielding, R., Gettys, J., Mogul, J., Frystyk, H.,
               Masinter, L., Leach, P., and T. Berners-Lee, "Hypertext
               Transfer Protocol -- HTTP/1.1", RFC 2616, June 1999.
 
    [RFC2818]  Rescorla, E., "HTTP Over TLS", RFC 2818, May 2000.
 
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 96]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    [RFC3253]  Clemm, G., Amsden, J., Ellison, T., Kaler, C., and J.
               Whitehead, "Versioning Extensions to WebDAV (Web
               Distributed Authoring and Versioning)", RFC 3253,
               March 2002.
 
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 92]
-
-Internet-Draft                   CalDAV                        July 2006
-
-
    [RFC3688]  Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688,
               January 2004.
 
@@ -5163,23 +5392,19 @@
    [RFC4346]  Dierks, T. and E. Rescorla, "The Transport Layer Security
               (TLS) Protocol Version 1.1", RFC 4346, April 2006.
 
-   [UNICODE4]
-              The Unicode Consortium, "The Unicode Standard, Version
-              4.0", Addison-Wesley, Boston, MA. ISBN 0-321-18578-1,
-              August 2003,
-              <http://www.unicode.org/versions/Unicode4.0.0/>.
+   [W3C.REC-xml-20060816]
+              Yergeau, F., Paoli, J., Bray, T., Sperberg-McQueen, C.,
+              and E. Maler, "Extensible Markup Language (XML) 1.0
+              (Fourth Edition)", World Wide Web Consortium
+              Recommendation REC-xml-20060816, August 2006,
+              <http://www.w3.org/TR/2006/REC-xml-20060816>.
 
-   [W3C.REC-xml-20040204]
-              Sperberg-McQueen, C., Maler, E., Bray, T., Paoli, J., and
-              F. Yergeau, "Extensible Markup Language (XML) 1.0 (Third
-              Edition)", World Wide Web Consortium
-              Recommendation http://www.w3.org/TR/2004/REC-xml-20040204,
-              February 2004.
-
 14.2.  Informative References
 
-   [RFC2251]  Wahl, M., Howes, T., and S. Kille, "Lightweight Directory
-              Access Protocol (v3)", RFC 2251, December 1997.
+   [I-D.ietf-webdav-rfc2518bis]
+              Dusseault, L., "HTTP Extensions for Distributed Authoring
+              - WebDAV", draft-ietf-webdav-rfc2518bis-15 (work in
+              progress), May 2006.
 
    [RFC2426]  Dawson, F. and T. Howes, "vCard MIME Directory Profile",
               RFC 2426, September 1998.
@@ -5191,7 +5416,10 @@
               for Distributed Authoring and Versioning (DAV)
               Collections", RFC 4331, February 2006.
 
+   [RFC4511]  Sermersheim, J., "Lightweight Directory Access Protocol
+              (LDAP): The Protocol", RFC 4511, June 2006.
 
+
 Appendix A.  CalDAV Method Privilege Table (Normative)
 
    The following table extends the WebDAV Method Privilege Table
@@ -5200,13 +5428,9 @@
 
 
 
-
-
-
-
-Daboo, et al.           Expires January 15, 2007               [Page 93]
+Daboo, et al.            Expires March 17, 2007                [Page 97]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    +------------+------------------------------------------------------+
@@ -5260,9 +5484,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 94]
+Daboo, et al.            Expires March 17, 2007                [Page 98]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    <D:multistatus xmlns:D="DAV:"
@@ -5316,9 +5540,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 95]
+Daboo, et al.            Expires March 17, 2007                [Page 99]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
            <D:getetag>"fffff-abcd2"</D:getetag>
@@ -5372,9 +5596,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 96]
+Daboo, et al.            Expires March 17, 2007               [Page 100]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
          <D:prop>
@@ -5428,9 +5652,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 97]
+Daboo, et al.            Expires March 17, 2007               [Page 101]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
            <C:calendar-data>BEGIN:VCALENDAR
@@ -5484,9 +5708,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 98]
+Daboo, et al.            Expires March 17, 2007               [Page 102]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
      <D:response>
@@ -5540,9 +5764,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007               [Page 99]
+Daboo, et al.            Expires March 17, 2007               [Page 103]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
      <D:response>
@@ -5578,8 +5802,61 @@
 
 Appendix C.  Changes (to be removed prior to publication as an RFC)
 
-C.1.  Changes in -13
+C.1.  Changes in -15
 
+   a.  Switched to using collations for text-match element in calendar-
+       query report.
+
+   b.  Removed caseless attribute from text-match element.
+
+   c.  Removed UNICODE4 reference.
+
+   d.  Removed mailing list comment.
+
+   e.  Made calendar-home-set property a SHOULD as it was in previous
+       drafts.
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 104]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+   f.  Now require https download of external attachments.
+
+   g.  Changed some improper uses of 2119 terms to lowercase.
+
+   h.  Updated some references to latest specs.
+
+C.2.  Changes in -14
+
+   a.  Reverted to normative reference to 2518 and added informative
+       reference to 2518bis.
+
+   b.  Reinserted section describing preconditions/postconditions.
+
+   c.  Removed redundant compliance statement in last paragraph of
+       Section 3.
+
+   d.  Clarify that only text/calendar is allowed if supported-calendar-
+       data property is not present.
+
+   e.  Removed redundant compliance statement in Conformance paragraph
+       of Section 6.2.1.
+
+   f.  Removed redundant compliance statement in first paragraph of
+       Section 7.5.
+
+   g.  Fixed incorrect whitespace in elements in example in Section
+       7.7.6.
+
+   h.  Fixed incorrect CDATA descriptions in various places.
+
+C.3.  Changes in -13
+
    a.  Changed mailing list draft description.
 
    b.  Added security review suggested text to Security Considerations.
@@ -5593,18 +5870,19 @@
    e.  Changed 'undefined' to 'not specified here' in ETag behavior
        section.
 
+   f.  Added reference to RFC4346 with note that it obsoletes RFC2246
 
 
 
-Daboo, et al.           Expires January 15, 2007              [Page 100]
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 105]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-   f.  Added reference to RFC4346 with note that it obsoletes RFC2246
+C.4.  Changes in -12
 
-C.2.  Changes in -12
-
    a.  Changed requirements for ETags on PUT to better reflect the needs
        of CalDAV clients wrt synchronization and reflect what other
        standards define or do not define.
@@ -5612,7 +5890,7 @@
    b.  Changed CALDAV:read-free-busy privilege so that it is also
        defined on regular collections.
 
-C.3.  Changes in -11
+C.5.  Changes in -11
 
    a.  Added statement that calendar-query Depth defaults to zero if
        header is not present.  Fixed one multiget example's Depth
@@ -5652,9 +5930,11 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007              [Page 101]
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 106]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    m.  Fixed descriptions of some calendar collection properties.
@@ -5679,7 +5959,7 @@
 
    t.  Clarified dependence on UNICODE reference for caseless matching.
 
-C.4.  Changes in -10
+C.6.  Changes in -10
 
    a.  Added new section about support for X- items when storing data.
 
@@ -5708,9 +5988,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007              [Page 102]
+Daboo, et al.            Expires March 17, 2007               [Page 107]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    j.  Add preconditions for calendar-timezone property/elements in
@@ -5718,7 +5998,7 @@
 
    k.  Fix principal-match example.
 
-C.5.  Changes in -09
+C.7.  Changes in -09
 
    a.   Numerous editorial changes.
 
@@ -5764,9 +6044,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007              [Page 103]
+Daboo, et al.            Expires March 17, 2007               [Page 108]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    o.   Changed XML element CALDAV:calendar-query to allow new XML
@@ -5809,7 +6089,7 @@
 
    aa.  Completed security considerations section.
 
-C.6.  Changes in -08
+C.8.  Changes in -08
 
    a.  Removed statement that said that client SHOULD always request
        DAV:getetag in calendar REPORTs.
@@ -5820,9 +6100,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007              [Page 104]
+Daboo, et al.            Expires March 17, 2007               [Page 109]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    c.  Removed XML elements CALDAV:calendar-data-only.
@@ -5858,7 +6138,7 @@
 
    o.  Added guidelines on attachments and alarms.
 
-C.7.  Changes in -07
+C.9.  Changes in -07
 
    a.  Various editorial changes.
 
@@ -5876,9 +6156,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007              [Page 105]
+Daboo, et al.            Expires March 17, 2007               [Page 110]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    f.  Added new XML elements calendar-data-only and limit-recurrent-
@@ -5899,7 +6179,7 @@
    l.  Rewrote section on calendar object resource restrictions for
        better clarity.
 
-C.8.  Changes in -06
+C.10.  Changes in -06
 
    a.  Reworded section "Recurrence and the Data Model".
 
@@ -5919,7 +6199,7 @@
    g.  Moved "Sychronization Operations" section in the "Guidelines"
        section.
 
-C.9.  Changes in -05
+C.11.  Changes in -05
 
    a.  Removed a lot of non-normative text.
 
@@ -5932,9 +6212,9 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007              [Page 106]
+Daboo, et al.            Expires March 17, 2007               [Page 111]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
    e.  Relaxed WebDAV Class 2 (locking) requirement to a MAY.
@@ -5963,7 +6243,7 @@
 
    p.  Grouped XML Element declarations in a separate section.
 
-C.10.  Changes in -04
+C.12.  Changes in -04
 
    a.  Added a note about the HTTP Location response header.
 
@@ -5988,12 +6268,12 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007              [Page 107]
+Daboo, et al.            Expires March 17, 2007               [Page 112]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
-C.11.  Changes in -03
+C.13.  Changes in -03
 
    a.  Removed Calendar Containers (simplification that doesn't seem to
        remove much functionality)
@@ -6002,7 +6282,7 @@
 
    c.  Added cal-scale property to calendars
 
-C.12.  Changes in -02
+C.14.  Changes in -02
 
    Basically still adding major sections of content:
 
@@ -6016,7 +6296,7 @@
 
    e.  Added new privileges for scheduling
 
-C.13.  Changes in -01
+C.15.  Changes in -01
 
    a.  Added section on privileges for calendaring, extending WebDAV ACL
        privilege set
@@ -6044,16 +6324,21 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007              [Page 108]
+Daboo, et al.            Expires March 17, 2007               [Page 113]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
 Authors' Addresses
 
    Cyrus Daboo
+   Apple Computer, Inc.
+   1 Infinite Loop
+   Cupertino, CA  95014
+   USA
 
    Email: cyrus at daboo.name
+   URI:   http://www.apple.com/
 
 
    Bernard Desruisseaux
@@ -6095,14 +6380,9 @@
 
 
 
-
-
-
-
-
-Daboo, et al.           Expires January 15, 2007              [Page 109]
+Daboo, et al.            Expires March 17, 2007               [Page 114]
 
-Internet-Draft                   CalDAV                        July 2006
+Internet-Draft                   CalDAV                   September 2006
 
 
 Intellectual Property Statement
@@ -6156,5 +6436,5 @@
 
 
 
-Daboo, et al.           Expires January 15, 2007              [Page 110]
+Daboo, et al.            Expires March 17, 2007               [Page 115]
 

Added: CalendarServer/trunk/doc/RFC/rfc4331-WebDAV Quota.txt
===================================================================
--- CalendarServer/trunk/doc/RFC/rfc4331-WebDAV Quota.txt	                        (rev 0)
+++ CalendarServer/trunk/doc/RFC/rfc4331-WebDAV Quota.txt	2006-09-26 02:38:55 UTC (rev 197)
@@ -0,0 +1,563 @@
+
+
+
+
+
+
+Network Working Group                                          B. Korver
+Request for Comments: 4331                             Network Resonance
+Category: Standards Track                                   L. Dusseault
+                                                                    OSAF
+                                                           February 2006
+
+
+                       Quota and Size Properties
+       for Distributed Authoring and Versioning (DAV) Collections
+
+Status of This Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (2006).
+
+Abstract
+
+   Web Distributed Authoring and Versioning (WebDAV) servers are
+   frequently deployed with quota (size) limitations.  This document
+   discusses the properties and minor behaviors needed for clients to
+   interoperate with quota (size) implementations on WebDAV
+   repositories.
+
+Table of Contents
+
+   1. Introduction ....................................................2
+      1.1. Notational Conventions .....................................2
+      1.2. Requirement for Quotas .....................................2
+   2. Solution Overview ...............................................3
+   3. DAV:quota-available-bytes .......................................3
+   4. DAV:quota-used-bytes ............................................4
+   5. Example PROPFIND Request and Response ...........................5
+   6. Error Reporting .................................................6
+   7. Notes ...........................................................6
+   8. Security Considerations .........................................8
+   9. Internationalization Considerations .............................8
+   10. Acknowledgements ...............................................8
+   11. References .....................................................8
+      11.1. Normative References ......................................8
+      11.2. Informative References ....................................8
+
+
+
+
+Korver & Dusseault          Standards Track                     [Page 1]
+
+RFC 4331                     WebDAV Quotas                 February 2006
+
+
+1.  Introduction
+
+1.1.  Notational Conventions
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in [RFC2119].
+
+   The definition of live property is provided in [RFC2518].  The
+   definition of protected and computed properties is provided in
+   [RFC3253], Section 1.4.
+
+1.2.  Requirement for Quotas
+
+   WebDAV servers based on [RFC2518] have been implemented and deployed
+   with quota restrictions on collections and users, so it makes sense
+   to standardize this functionality to improve user experience and
+   client interoperability.
+
+   The reasons why WebDAV servers frequently have quotas enforced are
+   the same reasons why any storage system comes with quotas.
+
+   o  Sometimes the storage service charges according to quota.
+
+   o  Sometimes the storage service is provided free, but the storage
+      service provider has limited storage space (e.g., university-
+      provided student accounts).
+
+   o  Even in cases where the storage can be upgraded, the storage
+      managers may choose to limit quota in order to encourage users to
+      limit the files they store on the system and to clean up obsolete
+      files (e.g., IT departments within corporations).
+
+   In order to work best with repositories that support quotas, client
+   software should be able to determine and display the DAV:quota-
+   available-bytes (defined below) on collections.  Further, client
+   software should have some way of fairly reliably determining how much
+   storage space is already counted towards that quota.
+
+   Support for the properties defined in this document enhances the
+   client experience, because the client has a chance of managing its
+   files to avoid running out of allocated storage space.  Clients may
+   not be able to calculate the value as accurately on their own,
+   depending on how total space used is calculated by the server.
+
+
+
+
+
+
+
+Korver & Dusseault          Standards Track                     [Page 2]
+
+RFC 4331                     WebDAV Quotas                 February 2006
+
+
+2.  Solution Overview
+
+   The approach to meeting the requirements and scenarios outlined above
+   is to define two live properties.  This specification can be met on a
+   server by implementing both DAV:quota-available-bytes and DAV:quota-
+   used-bytes on collections only.
+
+   A <DAV:allprop> PROPFIND request SHOULD NOT return any of the
+   properties defined by this document.  However, these property names
+   MUST be returned in a <DAV:propname> request for a resource that
+   supports the properties, except in the case of infinite limits, which
+   are explained below.
+
+   The DAV:quota-available-bytes and DAV:quota-used-bytes definitions
+   below borrow heavily from the quota definitions in the Network File
+   System (NFS) [RFC3530] specification.
+
+3.  DAV:quota-available-bytes
+
+   Name: quota-available-bytes
+
+   Namespace: DAV:
+
+   Purpose: Indicates the maximum amount of additional storage available
+      to be allocated to a resource.
+
+   DTD: <!ELEMENT quota-available-bytes (#PCDATA) >
+
+   The DAV:quota-available-bytes property value is the value in octets
+   representing the amount of additional disk space beyond the current
+   allocation that can be allocated to this resource before further
+   allocations will be refused.  It is understood that this space may be
+   consumed by allocations to other resources.
+
+   Support for this property is REQUIRED on collections, and OPTIONAL on
+   other resources.  A server SHOULD implement this property for each
+   resource that has the DAV:quota-used-bytes property.
+
+   Clients SHOULD expect that as the DAV:quota-available-bytes on a
+   resource approaches 0, further allocations to that resource may be
+   refused.  A value of 0 indicates that users will probably not be able
+   to perform operations that write additional information (e.g., a PUT
+   inside a collection), but may be able to replace through overwrite an
+   existing resource of equal size.
+
+   Note that there may be a number of distinct but overlapping limits,
+   which may even include physical media limits.  When reporting DAV:
+   quota-available-bytes, the server is at liberty to choose any of
+
+
+
+Korver & Dusseault          Standards Track                     [Page 3]
+
+RFC 4331                     WebDAV Quotas                 February 2006
+
+
+   those limits but SHOULD do so in a repeatable way.  The rule may be
+   configured per repository, or may be "choose the smallest number".
+
+   If a resource has no quota enforced or unlimited storage ("infinite
+   limits"), the server MAY choose not to return this property (404 Not
+   Found response in Multi-Status), although this specification
+   RECOMMENDS that servers return some appropriate value (e.g., the
+   amount of free disk space).  A client cannot entirely assume that
+   there is no quota enforced on a resource that does not have this
+   property, but might as well act as if there is no quota.
+
+   The value of this property is protected (see Section 1.4.2 of
+   [RFC3253] for the definition of protected properties).  A 403
+   Forbidden response is RECOMMENDED for attempts to write a protected
+   property, and the server SHOULD include an XML error body as defined
+   by DeltaV [RFC3253] with the <DAV:cannot-modify-protected-property/>
+   precondition tag.
+
+4.  DAV:quota-used-bytes
+
+   Name: quota-used-bytes
+
+   Namespace: DAV:
+
+   Purpose: Contains the amount of storage counted against the quota on
+      a resource.
+
+   DTD: <!ELEMENT quota-used-bytes (#PCDATA) >
+
+   The DAV:quota-used-bytes value is the value in octets representing
+   the amount of space used by this resource and possibly a number of
+   other similar resources, where the set of "similar" meets at least
+   the criterion that allocating space to any resource in the set will
+   count against the DAV:quota-available-bytes.  It MUST include the
+   total count including usage derived from sub-resources if
+   appropriate.  It SHOULD include metadata storage size if metadata
+   storage is counted against the DAV:quota-available-bytes.
+
+   Note that there may be a number of distinct but overlapping sets of
+   resources for which a DAV:quota-used-bytes is maintained (e.g., "all
+   files with a given owner", "all files with a given group owner",
+   etc.).  The server is at liberty to choose any of those sets but
+   SHOULD do so in a repeatable way.  The rule may be configured per
+   repository.
+
+   Support for this property is REQUIRED on collections, and OPTIONAL on
+   other resources.  A server SHOULD implement this property for each
+   resource that has the DAV:quota-available-bytes property.
+
+
+
+Korver & Dusseault          Standards Track                     [Page 4]
+
+RFC 4331                     WebDAV Quotas                 February 2006
+
+
+   This value of this property is computed (see Section 1.4.3 of
+   [RFC3253] for the definition of computed property).  A 403 Forbidden
+   response is RECOMMENDED for attempts to write a protected property,
+   and the server SHOULD include an XML error body as defined by DeltaV
+   [RFC3253] with the <DAV:cannot-modify-protected-property/>
+   precondition tag.
+
+5.  Example PROPFIND Request and Response
+
+   Request:
+
+         PROPFIND /~milele/public/ HTTP/1.1
+         Depth: 0
+         Host: www.example.com
+         Content-Type: text/xml
+         Content-Length: xxx
+
+         <?xml version="1.0" ?>
+         <D:propfind xmlns:D="DAV:">
+           <D:prop>
+             <D:quota-available-bytes/>
+             <D:quota-used-bytes/>
+           </D:prop>
+         </D:propfind>
+
+   Response:
+
+         HTTP/1.1 207 Multi-Status
+         Date: Tue, 16 Oct 2001 22:13:39 GMT
+         Content-Length: xxx
+         Content-Type: text/xml; charset=UTF-8
+
+         <?xml version="1.0" encoding="utf-8" ?>
+         <D:multistatus xmlns:D="DAV:">
+         <D:response>
+           <D:href>http://www.example.com/~milele/public/</D:href>
+           <D:propstat>
+             <D:prop>
+               <D:quota-available-bytes>596650</D:quota-available-bytes>
+               <D:quota-used-bytes>403350</D:quota-used-bytes>
+             </D:prop>
+             <D:status>HTTP/1.1 200 OK</D:status>
+           </D:propstat>
+         </D:response>
+         </D:multistatus>
+
+
+
+
+
+
+Korver & Dusseault          Standards Track                     [Page 5]
+
+RFC 4331                     WebDAV Quotas                 February 2006
+
+
+6.  Error Reporting
+
+   WebDAV [RFC2518] defines the status code 507 (Insufficient Storage).
+   This status code SHOULD be used when a client request (e.g., a PUT,
+   PROPFIND, MKCOL, MOVE, or COPY) fails because it would exceed their
+   quota or physical storage limits.  In order to differentiate the
+   response from other storage problems, the server SHOULD include an
+   XML error body as defined by DeltaV [RFC3253] with the appropriate
+   precondition tag.
+
+   Preconditions:
+
+   (DAV:quota-not-exceeded): the request MUST NOT cause the allocated
+   quota to be exceeded.
+
+   (DAV:sufficient-disk-space): there is sufficient physical space to
+   execute the request.
+
+   Example error response:
+
+      HTTP/1.1 507 Insufficient Storage
+      Content-Length: xxx
+      Content-Type: text/xml
+
+      <?xml version="1.0">
+      <error xmlns="DAV:">
+        <quota-not-exceeded/>
+      </error>
+
+   Implementation note: some clients may be able to take advantage of
+   the different precondition codes when mapping to operating system
+   status codes, such as E_NOSPC and E_DQUOT in NFS (see [RFC3530],
+   Section 12).
+
+7.  Notes
+
+   Server implementations store and account for their data in many
+   different ways.  Some of the challenges:
+
+   o  Some server implementations find it prohibitive to count storage
+      used for metadata; others may choose to do so for better
+      accounting.
+
+   o  Older versions of resources may be stored as well.
+
+   o  Variants of one resource may exist with different content lengths.
+
+   o  Content may be dynamically generated.
+
+
+
+Korver & Dusseault          Standards Track                     [Page 6]
+
+RFC 4331                     WebDAV Quotas                 February 2006
+
+
+   o  Resource bodies can be compressed.
+
+   o  Some resources may be stored for "free", not counting against
+      quota.
+
+   Since server storage accounting can vary so much, clients should
+   expect the following:
+
+   o  The size of a file on the client's file system, or in a PUT
+      message, may not correspond to the amount of storage required by
+      the server to store the resource.  Thus, the client cannot predict
+      with 100% accuracy whether a given file will be allowed given the
+      storage quota.
+
+   o  Deleting or overwriting a resource may not free up the same amount
+      of storage as indicated by the DAV:getcontentlength property
+      defined in [RFC2518] for the resource.  If deleting a resource
+      does not free up any space, the file may have been moved to a
+      "trash" folder or "recycle bin", or retained as in versioning
+      systems ([RFC3253]).
+
+   o  Since there are many factors that affect the storage used by a set
+      of resources, including automatic compression, the size of
+      associated metadata, and server-inserted content (such as that
+      created by PHP code) in the on-the-wire representation of
+      resources, clients are advised not to depend on the value of DAV:
+      quota-used-bytes being the sum of the DAV:getcontentlength
+      properties for resources contained by a collection.
+
+   o  Additionally, because there may be a number of distinct but
+      overlapping sets of resources for which a DAV:quota-used-bytes is
+      maintained (Section 4), there may be no correlation between the
+      size of the resources in a collection and DAV:quota-used-bytes.
+      For example, for a server that implements user-based quotas,
+      DAV:quota-used-bytes usually will be the same for a collection and
+      its members.
+
+   o  On some systems where quota is counted by collection and not by
+      user, a quota on a sub-collection may be larger than the quota on
+      the parent collection that contains it.  For example, the quota on
+      /~milele/ may be 100 MB, but the quota on /~milele/public/ may be
+      unlimited.  This allows the space used by /~milele/public/ to be
+      as large as the quota on /~milele/ allows (depending on the other
+      contents of /~milele/) even if the quota on /~milele/ is changed.
+      Thus, even when the quota on a parent collection is changed, it is
+      not necessarily required to change the quota on every child or
+      descendant collection.
+
+
+
+
+Korver & Dusseault          Standards Track                     [Page 7]
+
+RFC 4331                     WebDAV Quotas                 February 2006
+
+
+8.  Security Considerations
+
+   A hacker may prefer to store files in collections with a large quota.
+   This isn't strictly a security concern because it doesn't make it any
+   easier to store files.  On the other hand, the DAV:quota-used-bytes
+   property may make it easier to detect tampering or misuse.
+
+9.  Internationalization Considerations
+
+   Quota is counted in Arabic numerals expressed in strings.  There are
+   no internationalization considerations.
+
+10.  Acknowledgements
+
+   Stefan Eissing, Geoff Clemm, Jim Luther, Julian Reschke, and Jim
+   Whitehead, among others, have provided valuable comments on this
+   document.
+
+11.  References
+
+11.1.  Normative References
+
+   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [RFC2518]  Goland, Y., Whitehead, E., Faizi, A., Carter, S., and D.
+              Jensen, "HTTP Extensions for Distributed Authoring --
+              WebDAV", RFC 2518, February 1999.
+
+   [RFC3253]  Clemm, G., Amsden, J., Ellison, T., Kaler, C., and J.
+              Whitehead, "Versioning Extensions to WebDAV (Web
+              Distributed Authoring and Versioning)", RFC 3253, March
+              2002.
+
+11.2.  Informative References
+
+   [RFC3530]  Shepler, S., Callaghan, B., Robinson, D., Thurlow, R.,
+              Beame, C., Eisler, M., and D. Noveck, "Network File System
+              (NFS) version 4 Protocol", RFC 3530, April 2003.
+
+
+
+
+
+
+
+
+
+
+
+
+Korver & Dusseault          Standards Track                     [Page 8]
+
+RFC 4331                     WebDAV Quotas                 February 2006
+
+
+Authors' Addresses
+
+   Brian Korver
+   Network Resonance, Inc.
+   2483 E. Bayshore Road
+   Suite 212
+   Palo Alto, CA  94303
+   US
+
+   Phone: +1 650 812-7705
+   EMail: briank at networkresonance.com
+
+
+   Lisa Dusseault
+   Open Source Applications Foundation
+   543 Howard Street
+   5th Floor
+   San Francisco, CA  94105
+   US
+
+   Phone: +1 415 946-3040
+   EMail: lisa at osafoundation.org
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Korver & Dusseault          Standards Track                     [Page 9]
+
+RFC 4331                     WebDAV Quotas                 February 2006
+
+
+Full Copyright Statement
+
+   Copyright (C) The Internet Society (2006).
+
+   This document is subject to the rights, licenses and restrictions
+   contained in BCP 78, and except as set forth therein, the authors
+   retain all their rights.
+
+   This document and the information contained herein are provided on an
+   "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
+   OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE INTERNET
+   ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED,
+   INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+   INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+   WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Intellectual Property
+
+   The IETF takes no position regarding the validity or scope of any
+   Intellectual Property Rights or other rights that might be claimed to
+   pertain to the implementation or use of the technology described in
+   this document or the extent to which any license under such rights
+   might or might not be available; nor does it represent that it has
+   made any independent effort to identify any such rights.  Information
+   on the procedures with respect to rights in RFC documents can be
+   found in BCP 78 and BCP 79.
+
+   Copies of IPR disclosures made to the IETF Secretariat and any
+   assurances of licenses to be made available, or the result of an
+   attempt made to obtain a general license or permission for the use of
+   such proprietary rights by implementers or users of this
+   specification can be obtained from the IETF on-line IPR repository at
+   http://www.ietf.org/ipr.
+
+   The IETF invites any interested party to bring to its attention any
+   copyrights, patents or patent applications, or other proprietary
+   rights that may cover technology that may be required to implement
+   this standard.  Please address the information to the IETF at
+   ietf-ipr at ietf.org.
+
+Acknowledgement
+
+   Funding for the RFC Editor function is provided by the IETF
+   Administrative Support Activity (IASA).
+
+
+
+
+
+
+
+Korver & Dusseault          Standards Track                    [Page 10]
+

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060925/ce633110/attachment.html


More information about the calendarserver-changes mailing list