Attempt to support https in calls to archives

diff --git a/pgcommitfest/commitfest/ajax.py b/pgcommitfest/commitfest/ajax.py
index 14bbe053a83f10e470be6c452a7f3be6f4f9dc46..baf8470547229cc462ea30be6d456b50c34884d6 100644 (file)
--- a/pgcommitfest/commitfest/ajax.py
+++ b/pgcommitfest/commitfest/ajax.py
@@ -25,10 +25,16 @@ from models import MailThreadAnnotation, PatchHistory
 def _archivesAPI(suburl, params=None):
        try:
                socket.setdefaulttimeout(settings.ARCHIVES_TIMEOUT)
-               h = httplib.HTTPConnection(settings.ARCHIVES_SERVER,
-                                                                  settings.ARCHIVES_PORT,
-                                                                  True,
-                                                                  settings.ARCHIVES_TIMEOUT)
+               if settings.ARCHIVES_PORT != 443:
+                       h = httplib.HTTPConnection(settings.ARCHIVES_SERVER,
+                                                                          settings.ARCHIVES_PORT,
+                                                                          True,
+                                                                          settings.ARCHIVES_TIMEOUT)
+               else:
+                       h = httplib.HTTPSConnection(settings.ARCHIVES_SERVER,
+                                                                          settings.ARCHIVES_PORT,
+                                                                          True,
+                                                                          settings.ARCHIVES_TIMEOUT)
                if params:
                        url = "%s?%s" % (suburl, urllib.urlencode(params))
                else:

diff --git a/tools/commitfest/check_patches_in_archives.py b/tools/commitfest/check_patches_in_archives.py
index a0060ac967dbcac989e1ba81cdba249a8a3f3a97..edea52cdae705f2a76c2052c2ae95af5d5ed5485 100755 (executable)
--- a/tools/commitfest/check_patches_in_archives.py
+++ b/tools/commitfest/check_patches_in_archives.py
@@ -48,10 +48,16 @@ if __name__ == "__main__":
                url = "/message-id/attachment/%s/attach" % a.attachmentid
                logging.debug("Checking attachment %s" % a.attachmentid)
 
-               h = httplib.HTTPConnection(settings.ARCHIVES_SERVER,
-                                                                  settings.ARCHIVES_PORT,
-                                                                  True,
-                                                                  settings.ARCHIVES_TIMEOUT)
+               if settings.ARCHIVES_PORT != 443:
+                       h = httplib.HTTPConnection(settings.ARCHIVES_SERVER,
+                                                                          settings.ARCHIVES_PORT,
+                                                                          True,
+                                                                          settings.ARCHIVES_TIMEOUT)
+               else:
+                       h = httplib.HTTPSConnection(settings.ARCHIVES_SERVER,
+                                                                          settings.ARCHIVES_PORT,
+                                                                          True,
+                                                                          settings.ARCHIVES_TIMEOUT)
                h.request('GET', url, headers={
                        'Host': settings.ARCHIVES_HOST,
                        })