[CalendarServer-changes] [865] CalendarServer/trunk/twistedcaldav/tap.py

[source_changes at macosforge.org]

Revision: 865
          http://trac.macosforge.org/projects/calendarserver/changeset/865
Author:   wsanchez at apple.com
Date:     2006-12-20 10:54:40 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
Indent httpService.setServiceParent(service) into correct scope
Fixes #110
Submitted by strauss at ibr.cs.tu-bs.de

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/tap.py

Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py	2006-12-20 02:26:46 UTC (rev 864)
+++ CalendarServer/trunk/twistedcaldav/tap.py	2006-12-20 18:54:40 UTC (rev 865)
@@ -188,9 +188,10 @@
         realm = directory.realmName or ""
 
         # TODO: figure out the list of supported schemes from the directory
-        schemes = {'basic': basic.BasicCredentialFactory(realm),
-                   'digest': digest.DigestCredentialFactory("md5", realm),
-                   }
+        schemes = {
+            "basic" : basic.BasicCredentialFactory(realm),
+            "digest": digest.DigestCredentialFactory("md5", realm),
+        }
 
         for scheme in config.AuthSchemes:
             scheme = scheme.lower()
@@ -206,7 +207,8 @@
             root,
             portal,
             credentialFactories,
-            (auth.IPrincipal,))
+            (auth.IPrincipal,)
+        )
 
         site = Site(LogWrapperResource(authWrapper))
 
@@ -222,17 +224,16 @@
 
         if not config.SSLOnly:
             httpService = internet.TCPServer(int(config.Port), channel)
+            httpService.setServiceParent(service)
 
-        httpService.setServiceParent(service)
-
         if config.SSLEnable:
             from twisted.internet.ssl import DefaultOpenSSLContextFactory
             httpsService = internet.SSLServer(
                 int(config.SSLPort),
                 channel,
                 DefaultOpenSSLContextFactory(config.SSLPrivateKey,
-                                             config.SSLCertificate))
-
+                                             config.SSLCertificate)
+            )
             httpsService.setServiceParent(service)
             
         return service

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