[CalendarServer-changes] [14859] CalDAVTester/trunk/src/manager.py

[source_changes at macosforge.org]

Revision: 14859
          http://trac.calendarserver.org//changeset/14859
Author:   cdaboo at apple.com
Date:     2015-05-29 12:14:38 -0700 (Fri, 29 May 2015)
Log Message:
-----------
Fix default ports in test URIs.

Modified Paths:
--------------
    CalDAVTester/trunk/src/manager.py

Modified: CalDAVTester/trunk/src/manager.py
===================================================================
--- CalDAVTester/trunk/src/manager.py	2015-05-29 18:09:03 UTC (rev 14858)
+++ CalDAVTester/trunk/src/manager.py	2015-05-29 19:14:38 UTC (rev 14859)
@@ -152,19 +152,24 @@
         self.server_info.port = self.server_info.sslport if ssl else self.server_info.nonsslport
         self.server_info.port2 = self.server_info.sslport2 if ssl else self.server_info.nonsslport2
 
-        moresubs["$host:"] = "%s://%s:%d" % (
-            "https" if ssl else "http",
-            self.server_info.host,
-            self.server_info.port,
+        moresubs["$host:"] = "%s://%s" % (
+            "https" if ssl else "http", self.server_info.host,
         )
-        moresubs["$hostssl:"] = "https://%s:%d" % (self.server_info.host, self.server_info.sslport,)
+        if (ssl and self.server_info.port != 443) or (not ssl and self.server_info.port != 80):
+            moresubs["$host:"] += ":%d" % (self.server_info.port,)
+        moresubs["$hostssl:"] = "https://%s" % (self.server_info.host,)
+        if self.server_info.sslport != 443:
+            moresubs["$hostssl:"] += ":%d" % (self.server_info.sslport,)
 
-        moresubs["$host2:"] = "%s://%s:%d" % (
+        moresubs["$host2:"] = "%s://%s" % (
             "https" if ssl else "http",
             self.server_info.host2,
-            self.server_info.port2,
         )
-        moresubs["$hostssl2:"] = "https://%s:%d" % (self.server_info.host2, self.server_info.sslport2,)
+        if (ssl and self.server_info.port2 != 443) or (not ssl and self.server_info.port2 != 80):
+            moresubs["$host2:"] += ":%d" % (self.server_info.port2,)
+        moresubs["$hostssl2:"] = "https://%s" % (self.server_info.host2,)
+        if self.server_info.sslport2 != 443:
+            moresubs["$hostssl2:"] += ":%d" % (self.server_info.sslport2,)
 
         self.server_info.addsubs(moresubs)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150529/2c01a3ef/attachment.html>