<!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>[15160] 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/15160">15160</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-30 01:44:06 -0700 (Wed, 30 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update to latest server-info draft.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavextensionspy">CalendarServer/trunk/twistedcaldav/extensions.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavserverinfoxmlpy">CalendarServer/trunk/twistedcaldav/serverinfoxml.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 (15159 => 15160)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2015-09-30 08:41:09 UTC (rev 15159)
+++ CalendarServer/trunk/requirements-dev.txt 2015-09-30 08:44:06 UTC (rev 15160)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> q
</span><span class="cx"> tl.eggdeps
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@14856#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15157#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15159#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavextensionspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/extensions.py (15159 => 15160)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/extensions.py 2015-09-30 08:41:09 UTC (rev 15159)
+++ CalendarServer/trunk/twistedcaldav/extensions.py 2015-09-30 08:44:06 UTC (rev 15160)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> # See the License for the specific language governing permissions and
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><ins>+
</ins><span class="cx"> from __future__ import print_function
</span><span class="cx">
</span><span class="cx"> """
</span><span class="lines">@@ -79,15 +80,16 @@
</span><span class="cx"> class WebDAVServerInfoMixIn(object):
</span><span class="cx">
</span><span class="cx"> def renderHTTP(self, request):
</span><del>- def _addServerInfoToken(request, response):
</del><ins>+ def _addServerInfoURL(request, response):
</ins><span class="cx"> # server-info-token processing
</span><span class="cx"> if config.EnableServerInfo and (
</span><del>- request.headers.hasHeader("server-info-token") or
- request.method == "OPTIONS"
</del><ins>+ request.headers.hasHeader("server-info-token") and request.headers.getRawHeaders("server-info-token")[0] != config.ServerInfoToken or
+ not request.headers.hasHeader("server-info-token") and request.method == "OPTIONS"
</ins><span class="cx"> ):
</span><del>- response.headers.setRawHeaders("server-info-token", (config.ServerInfoToken,))
</del><ins>+ uri = request.unparseURL(path="/server-info")
+ response.headers.setRawHeaders("server-info-url", (uri,))
</ins><span class="cx"> return response
</span><del>- request.addResponseFilter(_addServerInfoToken, onlyOnce=True)
</del><ins>+ request.addResponseFilter(_addServerInfoURL, onlyOnce=True)
</ins><span class="cx"> return super(WebDAVServerInfoMixIn, self).renderHTTP(request)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (15159 => 15160)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2015-09-30 08:41:09 UTC (rev 15159)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2015-09-30 08:44:06 UTC (rev 15160)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx">
</span><span class="cx"> from twistedcaldav import caldavxml, customxml
</span><span class="cx"> from twistedcaldav import carddavxml
</span><del>-from twistedcaldav import serverinfoxml
</del><span class="cx"> from twistedcaldav import ical
</span><span class="cx"> from twistedcaldav.cache import PropfindCacheMixin
</span><span class="cx"> from twistedcaldav.caldavxml import caldav_namespace
</span><span class="lines">@@ -60,7 +59,7 @@
</span><span class="cx"> from txdav.common.icommondatastore import InternalDataStoreError, \
</span><span class="cx"> SyncTokenValidException
</span><span class="cx"> from txdav.xml import element
</span><del>-from txdav.xml.element import dav_namespace, HRef
</del><ins>+from txdav.xml.element import dav_namespace
</ins><span class="cx">
</span><span class="cx"> from txweb2 import responsecode, http, http_headers
</span><span class="cx"> from txweb2.auth.wrapper import UnauthorizedResponse
</span><span class="lines">@@ -555,10 +554,7 @@
</span><span class="cx"> customxml.AllowedSharingModes.qname(),
</span><span class="cx"> )
</span><span class="cx">
</span><del>- if config.EnableServerInfo:
- baseProperties += (serverinfoxml.ServerInfoHref.qname(),)
</del><span class="cx">
</span><del>-
</del><span class="cx"> return super(CalDAVResource, self).liveProperties() + baseProperties
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -710,10 +706,6 @@
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx">
</span><del>- elif qname == serverinfoxml.ServerInfoHref.qname():
- if config.EnableServerInfo:
- returnValue(serverinfoxml.ServerInfoHref(HRef.fromString("/server-info")))
-
</del><span class="cx"> result = (yield super(CalDAVResource, self).readProperty(property, request))
</span><span class="cx"> returnValue(result)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavserverinfoxmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/serverinfoxml.py (15159 => 15160)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/serverinfoxml.py 2015-09-30 08:41:09 UTC (rev 15159)
+++ CalendarServer/trunk/twistedcaldav/serverinfoxml.py 2015-09-30 08:44:06 UTC (rev 15160)
</span><span class="lines">@@ -19,18 +19,6 @@
</span><span class="cx"> SyncCollection, AddMember
</span><span class="cx">
</span><span class="cx"> @registerElement
</span><del>-class ServerInfoHref (WebDAVElement):
- namespace = dav_namespace
- name = "server-info-href"
- hidden = True
- protected = True
- allowed_children = {
- (dav_namespace, "href"): (0, 1),
- }
-
-
-
-@registerElement
</del><span class="cx"> class ServerInfo (WebDAVElement):
</span><span class="cx"> namespace = dav_namespace
</span><span class="cx"> name = "server-info"
</span></span></pre>
</div>
</div>
</body>
</html>