[CalendarServer-changes] [14751] CalDAVClientLibrary/trunk/caldavclientlibrary/client/httpshandler. py

[source_changes at macosforge.org]

Revision: 14751
          http://trac.calendarserver.org//changeset/14751
Author:   cdaboo at apple.com
Date:     2015-05-05 07:29:43 -0700 (Tue, 05 May 2015)
Log Message:
-----------
If a unix socket is specified that always overrides the TCL+SSL settings.

Modified Paths:
--------------
    CalDAVClientLibrary/trunk/caldavclientlibrary/client/httpshandler.py

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/client/httpshandler.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/client/httpshandler.py	2015-05-05 14:11:40 UTC (rev 14750)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/client/httpshandler.py	2015-05-05 14:29:43 UTC (rev 14751)
@@ -79,7 +79,9 @@
         connect.connect()
         return connect
 
-    if ssl:
+    if afunix:
+        connect = UnixSocketHTTPConnection(afunix)
+    elif ssl:
         # Iterate over the TL:S versions and find one that works and cache it for future use.
         for cached, connection_type in cached_types:
             if (host, port) in cached:
@@ -96,9 +98,7 @@
                 cached.remove((host, port))
 
         raise RuntimeError("Cannot connect via with TLSv1, SSLv3 or SSLv23")
-    elif afunix is None:
+    else:
         connect = httplib.HTTPConnection(host, port)
-    else:
-        connect = UnixSocketHTTPConnection(afunix)
     connect.connect()
     return connect
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150505/b3e52cbe/attachment.html>