OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2024-12-23 06:50:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

revert c0dd9c6

Browse source
This commit is contained in:
Jannes Höke 2016-04-24 14:14:00 +02:00
parent 7c8a0e00c0
commit 2f7cccfc9f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
telegram/ext/updater.py
View file

@ -301,11 +301,12 @@ class Updater(object):
if use_ssl: if use_ssl:
self._check_ssl_cert(cert, key) self._check_ssl_cert(cert, key)
if not webhook_url: # DO NOT CHANGE: Only set webhook if SSL is handled by library
webhook_url = self._gen_webhook_url(listen, port, url_path) if not webhook_url:
webhook_url = self._gen_webhook_url(listen, port, url_path)
self._set_webhook(webhook_url, bootstrap_retries, self._set_webhook(webhook_url, bootstrap_retries,
open(cert, 'rb') if use_ssl else None) open(cert, 'rb'))
self.httpd.serve_forever(poll_interval=1) self.httpd.serve_forever(poll_interval=1)