Private GIT

Skip to content
Snippets Groups Projects
Commit 50e1c30a authored by Dustyn Gibson's avatar Dustyn Gibson
Browse files

Merge branch 'hotfix-1956'

parents 57760adc f8bda7d8
Branches
Tags
No related merge requests found
......@@ -1312,9 +1312,6 @@ def _setUpSession(session, headers):
# request session ssl verify
session.verify = certifi.where()
# request session allow redirects
session.allow_redirects = True
# request session proxies
if not 'Referer' in session.headers and sickbeard.PROXY_SETTING:
logger.log("Using proxy: " + sickbeard.PROXY_SETTING, logger.DEBUG)
......@@ -1340,7 +1337,7 @@ def headURL(url, params=None, headers={}, timeout=30, session=None, json=False,
session.params = params
try:
resp = session.head(url, timeout=timeout)
resp = session.head(url, timeout=timeout, allow_redirects=True)
if not resp.ok:
logger.log(u"Requested url " + url + " returned status code is " + str(
......@@ -1349,7 +1346,7 @@ def headURL(url, params=None, headers={}, timeout=30, session=None, json=False,
if proxyGlypeProxySSLwarning is not None:
if re.search('The site you are attempting to browse is on a secure connection', resp.text):
resp = session.get(proxyGlypeProxySSLwarning)
resp = session.head(proxyGlypeProxySSLwarning, timeout=timeout, allow_redirects=True)
if not resp.ok:
logger.log(u"GlypeProxySSLwarning: Requested headURL " + url + " returned status code is " + str(
......@@ -1383,9 +1380,9 @@ def getURL(url, post_data=None, params={}, headers={}, timeout=30, session=None,
# decide if we get or post data to server
if post_data:
session.headers.update({'Content-Type': 'application/x-www-form-urlencoded'})
resp = session.post(url, data=post_data, timeout=timeout)
resp = session.post(url, data=post_data, timeout=timeout, allow_redirects=True)
else:
resp = session.get(url, timeout=timeout)
resp = session.get(url, timeout=timeout, allow_redirects=True)
if not resp.ok:
logger.log(u"Requested url " + url + " returned status code is " + str(
......@@ -1394,7 +1391,7 @@ def getURL(url, post_data=None, params={}, headers={}, timeout=30, session=None,
if proxyGlypeProxySSLwarning is not None:
if re.search('The site you are attempting to browse is on a secure connection', resp.text):
resp = session.get(proxyGlypeProxySSLwarning)
resp = session.get(proxyGlypeProxySSLwarning, timeout=timeout, allow_redirects=True)
if not resp.ok:
logger.log(u"GlypeProxySSLwarning: Requested url " + url + " returned status code is " + str(
......@@ -1424,7 +1421,7 @@ def download_file(url, filename, session=None, headers={}):
session.stream = True
try:
with closing(session.get(url)) as resp:
with closing(session.get(url, allow_redirects=True)) as resp:
if not resp.ok:
logger.log(u"Requested url " + url + " returned status code is " + str(
resp.status_code) + ': ' + codeDescription(resp.status_code), logger.DEBUG)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment