Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEFAULT_CONNECT_TIMEOUT = 10.0 #1519

Merged
merged 2 commits into from
Feb 17, 2025
Merged

DEFAULT_CONNECT_TIMEOUT = 10.0 #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95de5a5
`DEFAULT_CONNECT_TIMEOUT = 10.0`
abhinavsingh Feb 17, 2025
32d7d5c
unused
abhinavsingh Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions proxy/common/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ def _env_threadless_compliant() -> bool:
DEFAULT_THREADLESS = _env_threadless_compliant()
DEFAULT_LOCAL_EXECUTOR = True
DEFAULT_TIMEOUT = 10.0
DEFAULT_CONNECT_TIMEOUT = 10.0
DEFAULT_VERSION = False
DEFAULT_HTTP_PORT = 80
DEFAULT_HTTPS_PORT = 443
Expand Down
23 changes: 16 additions & 7 deletions proxy/common/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
from .types import HostPort
from .constants import (
CRLF, COLON, HTTP_1_1, IS_WINDOWS, WHITESPACE, DEFAULT_TIMEOUT,
DEFAULT_THREADLESS, PROXY_AGENT_HEADER_VALUE, DEFAULT_SSL_CONTEXT_OPTIONS,
DEFAULT_THREADLESS, DEFAULT_CONNECT_TIMEOUT, PROXY_AGENT_HEADER_VALUE,
DEFAULT_SSL_CONTEXT_OPTIONS,
)


Expand Down Expand Up @@ -249,9 +250,10 @@ def wrap_socket(


def new_socket_connection(
addr: HostPort,
timeout: float = DEFAULT_TIMEOUT,
source_address: Optional[HostPort] = None,
addr: HostPort,
timeout: float = DEFAULT_TIMEOUT,
connect_timeout: float = DEFAULT_CONNECT_TIMEOUT,
source_address: Optional[HostPort] = None,
) -> socket.socket:
conn = None
try:
Expand All @@ -260,22 +262,29 @@ def new_socket_connection(
conn = socket.socket(
socket.AF_INET, socket.SOCK_STREAM, 0,
)
conn.settimeout(timeout)
conn.settimeout(connect_timeout)
conn.connect(addr)
else:
conn = socket.socket(
socket.AF_INET6, socket.SOCK_STREAM, 0,
)
conn.settimeout(timeout)
conn.settimeout(connect_timeout)
conn.connect((addr[0], addr[1], 0, 0))
except ValueError:
pass # does not appear to be an IPv4 or IPv6 address

if conn is not None:
conn.settimeout(timeout)
return conn

# try to establish dual stack IPv4/IPv6 connection.
return socket.create_connection(addr, timeout=timeout, source_address=source_address)
conn = socket.create_connection(
addr,
timeout=connect_timeout,
source_address=source_address,
)
conn.settimeout(timeout)
return conn


class socket_connection(contextlib.ContextDecorator):
Expand Down
Loading