diff options
| author | Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk> | 2011-11-09 11:59:34 -0500 |
|---|---|---|
| committer | Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk> | 2011-11-09 11:59:34 -0500 |
| commit | ae863cd1e869a22f6b1bcfee93d4b801fd8e2200 (patch) | |
| tree | 6da14faba572a4e0de4cd245d0c17ca533a3f7d8 | |
| parent | 3dba97cef68714f36727d55a247d8c23e879da97 (diff) | |
bugfix: use secure servers for addressbook and sharing services.
| -rw-r--r-- | papyon/gnet/protocol/HTTP.py | 29 | ||||
| -rw-r--r-- | papyon/service/description/AB/__init__.py | 2 | ||||
| -rw-r--r-- | papyon/service/description/Sharing/__init__.py | 2 |
3 files changed, 16 insertions, 17 deletions
diff --git a/papyon/gnet/protocol/HTTP.py b/papyon/gnet/protocol/HTTP.py index 3efe909..4b3f5da 100644 --- a/papyon/gnet/protocol/HTTP.py +++ b/papyon/gnet/protocol/HTTP.py @@ -143,8 +143,8 @@ class HTTP(gobject.GObject): if response.status >= 100 and response.status < 200: return if not self._waiting_response: - logger.warning("Received response but wasn't waiting for one %s" % (parser)) - logger.warning(response) + logger.warning("Received response but wasn't waiting for one") + logger.warning("<<< " + str(response)) return self._waiting_response = False @@ -153,21 +153,20 @@ class HTTP(gobject.GObject): self.close() location = response.headers['Location'] logger.info("Server moved to %s" % location) - logger.warning(response) + logger.info("<<< " + str(response)) protocol, host, path, query, fragment = urlsplit(location) - if protocol == "http": - self._redirected = True - self._outgoing_queue[0].headers['Host'] = host - try: - host, port = host.rsplit(":", 1) - port = int(port) - except: - port = None - self._host = host - self._redirected = False - self._setup_transport() - return + self._redirected = True + self._outgoing_queue[0].headers['Host'] = host + try: + host, port = host.rsplit(":", 1) + port = int(port) + except: + port = None + self._host = host + self._redirected = False + self._setup_transport() + return if len(self._outgoing_queue) > 0: self._outgoing_queue.pop(0) # pop the request from the queue diff --git a/papyon/service/description/AB/__init__.py b/papyon/service/description/AB/__init__.py index 9015064..76a8345 100644 --- a/papyon/service/description/AB/__init__.py +++ b/papyon/service/description/AB/__init__.py @@ -20,7 +20,7 @@ name = "AB" description = "Hotmail address book service" -url = "http://byrdr.omega.contacts.msn.com/abservice/abservice.asmx" +url = "https://omega.contacts.msn.com/abservice/abservice.asmx" from constants import * diff --git a/papyon/service/description/Sharing/__init__.py b/papyon/service/description/Sharing/__init__.py index 10dde65..58a39be 100644 --- a/papyon/service/description/Sharing/__init__.py +++ b/papyon/service/description/Sharing/__init__.py @@ -20,7 +20,7 @@ name = "Sharing" description = "Membership address book service" -url = "http://byrdr.omega.contacts.msn.com/abservice/SharingService.asmx" +url = "https://omega.contacts.msn.com/abservice/SharingService.asmx" import FindMembership import AddMember |