From a704725112b84237604798be57ba52b28b5eb156 Mon Sep 17 00:00:00 2001 From: Noam Meltzer Date: Sat, 29 Jul 2017 01:45:11 +0300 Subject: [PATCH 1/2] Sane defaults for tcp socket options Currently only for linux as most of our userbase is there. fixes #535 --- telegram/utils/request.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/telegram/utils/request.py b/telegram/utils/request.py index adcdbe0ee1a..ca8d10b8d31 100644 --- a/telegram/utils/request.py +++ b/telegram/utils/request.py @@ -19,6 +19,7 @@ """This module contains methods to make POST and GET requests""" import os import socket +import sys import logging import warnings @@ -76,13 +77,20 @@ def __init__(self, self._connect_timeout = connect_timeout + sockopts = HTTPConnection.default_socket_options + [ + (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)] + + # TODO: Support other platforms like mac and windows. + if 'linux' in sys.platform: + sockopts.extend([(socket.SOL_SOCKET, socket.TCP_KEEPIDLE, 120), + (socket.SOL_SOCKET, socket.TCP_KEEPINTVL, 30), + (socket.SOL_SOCKET, socket.TCP_KEEPCNT, 8)]) + kwargs = dict( maxsize=con_pool_size, cert_reqs='CERT_REQUIRED', ca_certs=certifi.where(), - socket_options=HTTPConnection.default_socket_options + [ - (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1), - ], + socket_options=sockopts, timeout=urllib3.Timeout( connect=self._connect_timeout, read=read_timeout, total=None)) From 1d443436d62e20ef945a7dddde1005161b5fbd4a Mon Sep 17 00:00:00 2001 From: Noam Meltzer Date: Sat, 29 Jul 2017 13:48:58 +0300 Subject: [PATCH 2/2] Fix wrong protocol --- telegram/utils/request.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/telegram/utils/request.py b/telegram/utils/request.py index ca8d10b8d31..73d4b12ebd3 100644 --- a/telegram/utils/request.py +++ b/telegram/utils/request.py @@ -82,9 +82,9 @@ def __init__(self, # TODO: Support other platforms like mac and windows. if 'linux' in sys.platform: - sockopts.extend([(socket.SOL_SOCKET, socket.TCP_KEEPIDLE, 120), - (socket.SOL_SOCKET, socket.TCP_KEEPINTVL, 30), - (socket.SOL_SOCKET, socket.TCP_KEEPCNT, 8)]) + sockopts.append((socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, 120)) + sockopts.append((socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 30)) + sockopts.append((socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 8)) kwargs = dict( maxsize=con_pool_size, pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy