From 4e1cd543f50dbe002c57c5254949e51e44c537da Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 23 Feb 2014 13:25:22 +0530
Subject: [PATCH] When downloading recipes/get books plugins use HTTPS

---
 src/calibre/gui2/store/loader.py            | 8 ++++----
 src/calibre/web/feeds/recipes/collection.py | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/store/loader.py b/src/calibre/gui2/store/loader.py
index e4641da604..4beb36ae3c 100644
--- a/src/calibre/gui2/store/loader.py
+++ b/src/calibre/gui2/store/loader.py
@@ -13,7 +13,7 @@ from collections import OrderedDict
 from threading import Thread
 from urllib import urlencode
 
-from calibre import prints, browser
+from calibre import prints
 from calibre.constants import numeric_version, DEBUG
 from calibre.gui2.store import StorePlugin
 from calibre.utils.config import JSONConfig
@@ -23,14 +23,14 @@ class VersionMismatch(ValueError):
         ValueError.__init__(self, 'calibre too old')
         self.ver = ver
 
-def download_updates(ver_map={}, server='http://status.calibre-ebook.com'):
+def download_updates(ver_map={}, server='https://status.calibre-ebook.com'):
+    from calibre.utils.https import get_https_resource_securely
     data = {k:type(u'')(v) for k, v in ver_map.iteritems()}
     data['ver'] = '1'
     url = '%s/stores?%s'%(server, urlencode(data))
-    br = browser()
     # We use a timeout here to ensure the non-daemonic update thread does not
     # cause calibre to hang indefinitely during shutdown
-    raw = br.open(url, timeout=4.0).read()
+    raw = get_https_resource_securely(url, timeout=90.0)
 
     while raw:
         name, raw = raw.partition(b'\0')[0::2]
diff --git a/src/calibre/web/feeds/recipes/collection.py b/src/calibre/web/feeds/recipes/collection.py
index f9f5ab1f15..3d4ac952fb 100644
--- a/src/calibre/web/feeds/recipes/collection.py
+++ b/src/calibre/web/feeds/recipes/collection.py
@@ -13,7 +13,7 @@ from datetime import timedelta
 from lxml import etree
 from lxml.builder import ElementMaker
 
-from calibre import browser, force_unicode
+from calibre import force_unicode
 from calibre.utils.date import parse_date, now as nowf, utcnow, tzlocal, \
         isoformat, fromordinal
 from calibre.utils.recycle_bin import delete_file
@@ -186,8 +186,8 @@ def get_builtin_recipe_titles():
     return [r.get('title') for r in get_builtin_recipe_collection()]
 
 def download_builtin_recipe(urn):
-    br = browser()
-    return br.open_novisit('http://status.calibre-ebook.com/recipe/'+urn).read()
+    from calibre.utils.https import get_https_resource_securely
+    return get_https_resource_securely('https://status.calibre-ebook.com/recipe/'+urn)
 
 def get_builtin_recipe(urn):
     with zipfile.ZipFile(P('builtin_recipes.zip', allow_user_override=False), 'r') as zf: