diff options
| author | Magnus Hagander | 2017-01-07 13:09:23 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2017-01-07 13:09:23 +0000 |
| commit | ead6854f1d1a28fbc01c00dac2d7b4142081790e (patch) | |
| tree | 981f8cfa2af226995e454b54cfc54f5e1404a236 | |
| parent | 90100e2cb6804e3e3ad8b709fa65b13523dd943c (diff) | |
Attempt to support https in calls to archives
| -rw-r--r-- | pgcommitfest/commitfest/ajax.py | 14 | ||||
| -rwxr-xr-x | tools/commitfest/check_patches_in_archives.py | 14 |
2 files changed, 20 insertions, 8 deletions
diff --git a/pgcommitfest/commitfest/ajax.py b/pgcommitfest/commitfest/ajax.py index 14bbe05..baf8470 100644 --- 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 a0060ac..edea52c 100755 --- 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, }) |