<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13625] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13625">13625</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-06-10 09:28:47 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>If TZID is not recognized by the server, reject the PUT.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_icalendarpy">CalendarServer/trunk/twistedcaldav/test/test_icalendar.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavicalendarstorepy">CalendarServer/trunk/txdav/caldav/icalendarstore.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (13624 => 13625)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2014-06-10 16:26:48 UTC (rev 13624)
+++ CalendarServer/trunk/requirements-dev.txt 2014-06-10 16:28:47 UTC (rev 13625)
</span><span class="lines">@@ -7,4 +7,4 @@
</span><span class="cx"> mockldap
</span><span class="cx"> q
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13547#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13624#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (13624 => 13625)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py 2014-06-10 16:26:48 UTC (rev 13624)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2014-06-10 16:28:47 UTC (rev 13625)
</span><span class="lines">@@ -1063,11 +1063,16 @@
</span><span class="cx"> """
</span><span class="cx"> result = set()
</span><span class="cx">
</span><del>- for property in self.properties():
- tzid = property.parameterValue("TZID")
- if tzid is not None:
- result.add(tzid)
- break
</del><ins>+ if self.name() == "VCALENDAR":
+ for component in self.subcomponents():
+ if component.name() != "VTIMEZONE":
+ result.update(component.timezoneIDs())
+ else:
+ for property in self.properties():
+ tzid = property.parameterValue("TZID")
+ if tzid is not None:
+ result.add(tzid)
+ break
</ins><span class="cx">
</span><span class="cx"> return result
</span><span class="cx">
</span><span class="lines">@@ -2032,6 +2037,12 @@
</span><span class="cx"> "Timezone {0} is not referenced by any non-timezone component".format(timezone,)
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ # TZIDs without a VTIMEZONE must be available in the server's TZ database
+ missing_timezones = timezone_refs - timezones
+ for tzid in missing_timezones:
+ # Will raise TimezoneException if tzid not present in server's database
+ hasTZ(tzid)
+
</ins><span class="cx"> # Control character check - only HTAB, CR, LF allowed for characters in the range 0x00-0x1F
</span><span class="cx"> s = str(self)
</span><span class="cx"> if len(s.translate(None, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F")) != len(s):
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (13624 => 13625)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2014-06-10 16:26:48 UTC (rev 13624)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2014-06-10 16:28:47 UTC (rev 13625)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> InvalidPerUserDataMerge,
</span><span class="cx"> AttendeeAllowedError, ResourceDeletedError, InvalidAttachmentOperation,
</span><span class="cx"> ShareeAllowedError, DuplicatePrivateCommentsError, InvalidSplit
</span><del>-, AttachmentSizeTooLarge)
</del><ins>+, AttachmentSizeTooLarge, UnknownTimezone)
</ins><span class="cx"> from txdav.carddav.iaddressbookstore import (
</span><span class="cx"> KindChangeNotAllowedError, GroupWithUnsharedAddressNotAllowedError
</span><span class="cx"> )
</span><span class="lines">@@ -2734,6 +2734,7 @@
</span><span class="cx"> ShareeAllowedError: (_CommonObjectResource._storeExceptionError, (calendarserver_namespace, "sharee-privilege-needed",),),
</span><span class="cx"> DuplicatePrivateCommentsError: (_CommonObjectResource._storeExceptionError, (calendarserver_namespace, "no-duplicate-private-comments",),),
</span><span class="cx"> LockTimeout: (_CommonObjectResource._storeExceptionUnavailable, "Lock timed out.",),
</span><ins>+ UnknownTimezone: (_CommonObjectResource._storeExceptionError, (caldav_namespace, "valid-timezone"),),
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StoreMoveExceptionsErrors = {
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_icalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_icalendar.py (13624 => 13625)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_icalendar.py 2014-06-10 16:26:48 UTC (rev 13624)
+++ CalendarServer/trunk/twistedcaldav/test/test_icalendar.py 2014-06-10 16:28:47 UTC (rev 13625)
</span><span class="lines">@@ -21,16 +21,17 @@
</span><span class="cx"> from twisted.trial.unittest import SkipTest
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, succeed
</span><span class="cx">
</span><ins>+from twistedcaldav.dateops import normalizeForExpand
</ins><span class="cx"> from twistedcaldav.ical import Component, Property, InvalidICalendarDataError, \
</span><span class="cx"> normalizeCUAddress, normalize_iCalStr
</span><ins>+from twistedcaldav.ical import iCalendarProductID
</ins><span class="cx"> from twistedcaldav.instance import InvalidOverriddenInstanceError
</span><span class="cx"> import twistedcaldav.test.util
</span><ins>+from twistedcaldav.timezones import TimezoneException
</ins><span class="cx">
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><span class="cx"> from pycalendar.timezone import Timezone
</span><del>-from twistedcaldav.ical import iCalendarProductID
</del><span class="cx"> from pycalendar.duration import Duration
</span><del>-from twistedcaldav.dateops import normalizeForExpand
</del><span class="cx"> from pycalendar.value import Value
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -654,9 +655,27 @@
</span><span class="cx"> self.assertEqual(end, DateTime(2004, 11, 27))
</span><span class="cx"> break
</span><span class="cx">
</span><del>- # test_component_timerange.todo = "recurrence expansion should give us no end date here"
</del><span class="cx">
</span><ins>+ def test_component_timezone_validate(self):
+ """
+ CalDAV resource validation.
+ """
+ data = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;TZID=BOGUS:20130806T000000
+DURATION:PT1H
+DTSTAMP:20051222T210507Z
+SUMMARY:1
+END:VEVENT
+END:VCALENDAR
+"""
+ calendar = Component.fromString(data)
+ self.failUnlessRaises(TimezoneException, calendar.validCalendarForCalDAV, False)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_parse_date(self):
</span><span class="cx"> """
</span><span class="cx"> parse_date()
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (13624 => 13625)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-06-10 16:26:48 UTC (rev 13624)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-06-10 16:28:47 UTC (rev 13625)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> from twistedcaldav.ical import Component, InvalidICalendarDataError, Property
</span><span class="cx"> from twistedcaldav.instance import InvalidOverriddenInstanceError
</span><span class="cx"> from twistedcaldav.memcacher import Memcacher
</span><ins>+from twistedcaldav.timezones import TimezoneException
</ins><span class="cx">
</span><span class="cx"> from txdav.base.propertystore.base import PropertyName
</span><span class="cx"> from txdav.caldav.datastore.query.builder import buildExpression
</span><span class="lines">@@ -80,7 +81,7 @@
</span><span class="cx"> InvalidDefaultCalendar, \
</span><span class="cx"> InvalidAttachmentOperation, DuplicatePrivateCommentsError, \
</span><span class="cx"> TimeRangeUpperLimit, TimeRangeLowerLimit, InvalidSplit, \
</span><del>- AttachmentSizeTooLarge
</del><ins>+ AttachmentSizeTooLarge, UnknownTimezone
</ins><span class="cx"> from txdav.caldav.icalendarstore import QuotaExceeded
</span><span class="cx"> from txdav.common.datastore.sql import CommonHome, CommonHomeChild, \
</span><span class="cx"> CommonObjectResource, ECALENDARTYPE
</span><span class="lines">@@ -1891,6 +1892,10 @@
</span><span class="cx">
</span><span class="cx"> # Basic validation
</span><span class="cx">
</span><ins>+ # Possible timezone stripping
+ if config.EnableTimezonesByReference:
+ component.stripKnownTimezones()
+
</ins><span class="cx"> # Do validation on external requests
</span><span class="cx"> if internal_state == ComponentUpdateState.NORMAL:
</span><span class="cx">
</span><span class="lines">@@ -1917,10 +1922,6 @@
</span><span class="cx"> # Valid attendee list size check
</span><span class="cx"> yield self.validAttendeeListSizeCheck(component, inserting)
</span><span class="cx">
</span><del>- # Possible timezone stripping
- if config.EnableTimezonesByReference:
- component.stripKnownTimezones()
-
</del><span class="cx"> # Check location/resource organizer requirement
</span><span class="cx"> self.validLocationResourceOrganizer(component, inserting, internal_state)
</span><span class="cx">
</span><span class="lines">@@ -2095,12 +2096,16 @@
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> component.validCalendarData(validateRecurrences=self._txn._migrating)
</span><del>- except InvalidICalendarDataError, e:
</del><ins>+ except InvalidICalendarDataError as e:
</ins><span class="cx"> raise InvalidObjectResourceError(str(e))
</span><span class="cx"> try:
</span><span class="cx"> component.validCalendarForCalDAV(methodAllowed=self.calendar().isInbox())
</span><del>- except InvalidICalendarDataError, e:
</del><ins>+ except InvalidICalendarDataError as e:
</ins><span class="cx"> raise InvalidComponentForStoreError(str(e))
</span><ins>+ except TimezoneException as e:
+ # tzid not available
+ raise UnknownTimezone(str(e))
+
</ins><span class="cx"> try:
</span><span class="cx"> if self._txn._migrating:
</span><span class="cx"> component.validOrganizerForScheduling(doFix=True)
</span><span class="lines">@@ -4043,7 +4048,7 @@
</span><span class="cx"> in L{CalendarObject.splitAt}).
</span><span class="cx"> @type rid: L{DateTime}
</span><span class="cx"> @param olderUID: sets the iCalendar UID to be used in the new resource created during the split.
</span><del>- If L{None} a UUID is generated and used.
</del><ins>+ If set to L{None}, a UUID is generated and used.
</ins><span class="cx"> @type olderUID: L{str}
</span><span class="cx"> """
</span><span class="cx">
</span><span class="lines">@@ -4065,7 +4070,7 @@
</span><span class="cx"> newerUID = calendar.resourceUID()
</span><span class="cx"> if olderUID is None:
</span><span class="cx"> olderUID = str(uuid.uuid4())
</span><del>- olderResourceName = olderUID
</del><ins>+ olderResourceName = "{0}.ics".format(olderUID)
</ins><span class="cx"> else:
</span><span class="cx"> olderResourceName = "{0}.ics".format(olderUID.encode("base64")[:-1].rstrip("="))
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (13624 => 13625)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2014-06-10 16:26:48 UTC (rev 13624)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2014-06-10 16:28:47 UTC (rev 13625)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml, ical
</span><span class="cx"> from twistedcaldav.caldavxml import CalendarDescription
</span><del>-from twistedcaldav.config import config
</del><ins>+from twistedcaldav.stdconfig import config
</ins><span class="cx"> from twistedcaldav.dateops import datetimeMktime
</span><span class="cx"> from twistedcaldav.ical import Component, normalize_iCalStr, diff_iCalStrs
</span><span class="cx"> from twistedcaldav.instance import InvalidOverriddenInstanceError
</span><span class="lines">@@ -61,8 +61,9 @@
</span><span class="cx"> CommonCommonTests
</span><span class="cx"> from txdav.caldav.datastore.util import _migrateCalendar, migrateHome
</span><span class="cx"> from txdav.caldav.icalendarstore import ComponentUpdateState, InvalidDefaultCalendar, \
</span><del>- InvalidSplit
-from txdav.common.icommondatastore import NoSuchObjectResourceError
</del><ins>+ InvalidSplit, UnknownTimezone
+from txdav.common.icommondatastore import NoSuchObjectResourceError, \
+ InvalidComponentForStoreError
</ins><span class="cx"> from txdav.idav import ChangeCategory
</span><span class="cx"> from txdav.xml.rfc2518 import GETContentLanguage, ResourceType
</span><span class="cx">
</span><span class="lines">@@ -1977,7 +1978,46 @@
</span><span class="cx"> self.assertFalse(inbox.isUsedForFreeBusy())
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_missingTimezone(self):
+ """
+ Make sure missing timezone causes an exception, whether or timezones by reference is on.
+ """
+ data = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;TZID=BOGUS:20130806T000000
+DURATION:PT1H
+DTSTAMP:20051222T210507Z
+SUMMARY:1
+END:VEVENT
+END:VCALENDAR
+"""
</ins><span class="cx">
</span><ins>+ self.patch(config, "EnableTimezonesByReference", False)
+
+ yield self.homeUnderTest(name="user01", create=True)
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
+ yield self.failUnlessFailure(
+ calendar.createCalendarObjectWithName("data1.ics", Component.fromString(data)),
+ InvalidComponentForStoreError,
+ )
+ yield self.abort()
+
+ self.patch(config, "EnableTimezonesByReference", True)
+
+ yield self.homeUnderTest(name="user01", create=True)
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
+ yield self.failUnlessFailure(
+ calendar.createCalendarObjectWithName("data1.ics", Component.fromString(data)),
+ UnknownTimezone,
+ )
+ yield self.abort()
+
+
+
</ins><span class="cx"> class SchedulingTests(CommonCommonTests, unittest.TestCase):
</span><span class="cx"> """
</span><span class="cx"> CalendarObject splitting tests
</span><span class="lines">@@ -2167,8 +2207,8 @@
</span><span class="cx"> PRODID:-//Apple Inc.//Mac OS X 10.9.1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> UID:561F5DBB-3F38-4B3A-986F-DD05CBAF554F
</span><del>-DTSTART;TZID=America/Los_Angeles:20131211T164500
-DTEND;TZID=America/Los_Angeles:20131211T174500
</del><ins>+DTSTART:20131211T164500Z
+DURATION:PT1H
</ins><span class="cx"> ATTENDEE;CN=Conference Room One;CUTYPE=ROOM;PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPAN
</span><span class="cx"> T;SCHEDULE-STATUS=2.0:urn:x-uid:room-addr-1
</span><span class="cx"> ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=user01@example.com;PARTSTAT=AC
</span><span class="lines">@@ -2183,9 +2223,9 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> UID:561F5DBB-3F38-4B3A-986F-DD05CBAF554F
</span><del>-RECURRENCE-ID;TZID=America/Los_Angeles:20131214T164500
-DTSTART;TZID=America/Los_Angeles:20131214T160000
-DTEND;TZID=America/Los_Angeles:20131214T170000
</del><ins>+RECURRENCE-ID:20131214T164500Z
+DTSTART:20131214T160000Z
+DURATION:PT1H
</ins><span class="cx"> ATTENDEE;CN=Conference Room Two;CUTYPE=ROOM;PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPAN
</span><span class="cx"> T;SCHEDULE-STATUS=2.0:urn:x-uid:room-addr-2
</span><span class="cx"> ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=user01@example.com;PARTSTAT=AC
</span><span class="lines">@@ -2240,8 +2280,8 @@
</span><span class="cx"> PRODID:-//Apple Inc.//Mac OS X 10.9.1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> UID:561F5DBB-3F38-4B3A-986F-DD05CBAF554F
</span><del>-DTSTART;TZID=America/Los_Angeles:20131211T164500
-DTEND;TZID=America/Los_Angeles:20131211T174500
</del><ins>+DTSTART:20131211T164500Z
+DURATION:PT1H
</ins><span class="cx"> ATTENDEE;X-APPLE-HOSTED-STATUS=EXTERNAL:urn:x-uid:user01
</span><span class="cx"> ATTENDEE:mailto:someone_external@example.com
</span><span class="cx"> CREATED:20131211T221854Z
</span><span class="lines">@@ -2293,14 +2333,14 @@
</span><span class="cx"> PRODID:-//Apple Inc.//Mac OS X 10.9.1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> UID:561F5DBB-3F38-4B3A-986F-DD05CBAF554F
</span><del>-DTSTART;TZID=America/Los_Angeles:20131211T164500
</del><ins>+DTSTART:20131211T164500Z
</ins><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE:urn:x-uid:user01
</span><span class="cx"> CREATED:20131211T221854Z
</span><span class="cx"> DTSTAMP:20131211T230632Z
</span><span class="cx"> ORGANIZER:urn:x-uid:user01
</span><span class="cx"> RRULE:FREQ=DAILY;COUNT=1
</span><del>-EXDATE;TZID=America/Los_Angeles:20131211T164500
</del><ins>+EXDATE:20131211T164500Z
</ins><span class="cx"> SUMMARY:external
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavicalendarstorepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/icalendarstore.py (13624 => 13625)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/icalendarstore.py 2014-06-10 16:26:48 UTC (rev 13624)
+++ CalendarServer/trunk/txdav/caldav/icalendarstore.py 2014-06-10 16:28:47 UTC (rev 13625)
</span><span class="lines">@@ -857,6 +857,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class UnknownTimezone(CommonStoreError):
+ """
+ Unknown timezone id used.
+ """
+
+
+
</ins><span class="cx"> #
</span><span class="cx"> # FIXME: These may belong elsewhere.
</span><span class="cx"> #
</span></span></pre>
</div>
</div>
</body>
</html>