monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-05 17:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
JackDandy 2018-01-15 17:37:29 +00:00
commit 302121503c
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.md
View file

@ -11,6 +11,11 @@
* Add 'PB', 'EB', 'ZB', 'YB' to recognised output sizes
### 0.13.11 (2018-01-15 17:35:00 UTC)
* Fix issue fetching data in a rare case
### 0.13.10 (2018-01-08 17:20:00 UTC)
* Fix "Upgrade once" for wanted qualities

3
sickbeard/helpers.py
View file

@ -1119,6 +1119,7 @@ def getURL(url, post_data=None, params=None, headers=None, timeout=30, session=N
# reuse or instantiate request session
if None is session:
session = CloudflareScraper.create_scraper()
session.headers.update({'User-Agent': USER_AGENT})
# download and save file or simply fetch url
savename = None
@ -1135,7 +1136,7 @@ def getURL(url, post_data=None, params=None, headers=None, timeout=30, session=N
# session master headers
req_headers = {'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
'Accept-Encoding': 'gzip,deflate', 'User-Agent': USER_AGENT}
'Accept-Encoding': 'gzip,deflate'}
if headers:
req_headers.update(headers)
if hasattr(session, 'reserved') and 'headers' in session.reserved: