<!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>[14259] 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/14259">14259</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-01-07 11:41:38 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix sim to work with Twisted 14.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesticalpy">CalendarServer/trunk/contrib/performance/loadtest/ical.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (14258 => 14259)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2015-01-07 18:17:29 UTC (rev 14258)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2015-01-07 19:41:38 UTC (rev 14259)
</span><span class="lines">@@ -580,8 +580,8 @@
</span><span class="cx"> )
</span><span class="cx"> root.putChild(".well-known", wellKnownResource)
</span><span class="cx"> for enabled, wellknown_name, redirected_to in (
</span><del>- (config.EnableCalDAV, "caldav", "/principals",),
- (config.EnableCardDAV, "carddav", "/principals",),
</del><ins>+ (config.EnableCalDAV, "caldav", "/principals/",),
+ (config.EnableCardDAV, "carddav", "/principals/",),
</ins><span class="cx"> (config.TimezoneService.Enabled, "timezone", "/stdtimezones",),
</span><span class="cx"> (config.Scheduling.iSchedule.Enabled, "ischedule", "/ischedule"),
</span><span class="cx"> ):
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesticalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py (14258 => 14259)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/ical.py 2015-01-07 18:17:29 UTC (rev 14258)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py 2015-01-07 19:41:38 UTC (rev 14259)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> from twext.internet.adaptendpoint import connect
</span><span class="cx"> from twext.internet.gaiendpoint import GAIEndpoint
</span><ins>+from twisted.internet.ssl import ClientContextFactory
</ins><span class="cx">
</span><span class="cx"> from twisted.internet.defer import Deferred, inlineCallbacks, returnValue, \
</span><span class="cx"> succeed
</span><span class="lines">@@ -42,7 +43,8 @@
</span><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="cx"> from twisted.python.log import addObserver, err, msg
</span><span class="cx"> from twisted.python.util import FancyEqMixin
</span><del>-from twisted.web.client import Agent, ContentDecoderAgent, GzipDecoder
</del><ins>+from twisted.web.client import Agent, ContentDecoderAgent, GzipDecoder, \
+ _DeprecatedToCurrentPolicyForHTTPS
</ins><span class="cx"> from twisted.web.http import OK, MULTI_STATUS, CREATED, NO_CONTENT, PRECONDITION_FAILED, MOVED_PERMANENTLY, \
</span><span class="cx"> FORBIDDEN, FOUND
</span><span class="cx"> from twisted.web.http_headers import Headers
</span><span class="lines">@@ -349,6 +351,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class WebClientContextFactory(ClientContextFactory):
+ """
+ A web context factory which ignores the hostname and port and does no
+ certificate verification.
+ """
+ def getContext(self, hostname, port):
+ return ClientContextFactory.getContext(self)
+
+
+
</ins><span class="cx"> class BaseAppleClient(BaseClient):
</span><span class="cx"> """
</span><span class="cx"> Implementation of common OS X/iOS client behavior.
</span><span class="lines">@@ -421,7 +433,10 @@
</span><span class="cx"> self.reactor = reactor
</span><span class="cx">
</span><span class="cx"> # The server might use gzip encoding
</span><del>- agent = Agent(self.reactor)
</del><ins>+ agent = Agent(
+ self.reactor,
+ contextFactory=_DeprecatedToCurrentPolicyForHTTPS(WebClientContextFactory()),
+ )
</ins><span class="cx"> agent = ContentDecoderAgent(agent, [("gzip", GzipDecoder)])
</span><span class="cx"> self.agent = AuthHandlerAgent(agent, auth)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>