[CalendarServer-changes] [15042] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Aug 14 19:19:49 PDT 2015
Revision: 15042
http://trac.calendarserver.org//changeset/15042
Author: sagen at apple.com
Date: 2015-08-14 19:19:49 -0700 (Fri, 14 Aug 2015)
Log Message:
-----------
Get latest twext with LDAP fixes
Modified Paths:
--------------
CalendarServer/trunk/requirements-stable.txt
CalendarServer/trunk/twistedcaldav/extensions.py
Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt 2015-08-15 02:19:38 UTC (rev 15041)
+++ CalendarServer/trunk/requirements-stable.txt 2015-08-15 02:19:49 UTC (rev 15042)
@@ -36,7 +36,7 @@
#pyOpenSSL
pycrypto==2.6.1
- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15035#egg=twextpy
+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15040#egg=twextpy
cffi==1.1.0
pycparser==2.13
#twisted
Modified: CalendarServer/trunk/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/extensions.py 2015-08-15 02:19:38 UTC (rev 15041)
+++ CalendarServer/trunk/twistedcaldav/extensions.py 2015-08-15 02:19:49 UTC (rev 15042)
@@ -331,10 +331,14 @@
matchingResources = []
matchcount = 0
+ limitResults = config.MaxPrincipalSearchReportResults
+ if clientLimit is not None:
+ limitResults = min(clientLimit, limitResults)
+
records = (yield dir.recordsMatchingTokens(
tokens,
context=context,
- limitResults=clientLimit,
+ limitResults=limitResults,
timeoutSeconds=10
))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150814/cc81d6ed/attachment.html>
More information about the calendarserver-changes
mailing list