Skip to content

bpo-45328: Avoid failure in OSs without TCP_NODELAY support #28646

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

Merged
ambv merged 2 commits into from
Oct 6, 2021
Merged

bpo-45328: Avoid failure in OSs without TCP_NODELAY support #28646

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59a10e1
bpo-45328: Avoid failure in OSs without TCP_NODELAY support
rtobar Sep 30, 2021
dd8c200
bpo-45328: Document fix in http.client.HTTPConnection
rtobar Oct 5, 2021
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
Next Next commit
bpo-45328: Avoid failure in OSs without TCP_NODELAY support 
OSs without support for TCP_NODELAY will raise an OSError when trying to
set the socket option, but the show can still go on.
  • Loading branch information
@rtobar
rtobar committed Sep 30, 2021
commit 59a10e106a1258aabcad9d7cd69c15d261301fe9
8 changes: 7 additions & 1 deletion Lib/http/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@

import email.parser
import email.message
import errno
import http
import io
import re
Expand Down Expand Up @@ -939,7 +940,12 @@ def connect(self):
sys.audit("http.client.connect", self, self.host, self.port)
self.sock = self._create_connection(
(self.host,self.port), self.timeout, self.source_address)
self.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
# Might fail in OSs that don't implement TCP_NODELAY
try:
self.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
except OSError as e:
if e.errno != errno.ENOPROTOOPT:
raise

if self._tunnel_host:
self._tunnel()
Expand Down