mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 08:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-45328: Avoid failure in OSs without TCP_NODELAY support (GH-28646) (GH-28771)

Browse source 
Operating systems without support for TCP_NODELAY will raise an OSError
when trying to set the socket option, but the show can still go on.
(cherry picked from commit 0571b934f5)

Co-authored-by: rtobar <rtobarc@gmail.com>
This commit is contained in:
Miss Islington (bot) 2021-10-06 11:29:23 -07:00 • committed by GitHub
parent dcdeb96495
commit 4c35a2aa80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/http/client.py
View file

@ -70,6 +70,7 @@ Req-sent-unread-response _CS_REQ_SENT <response_class>
import email.parser import email.parser
import email.message import email.message
import errno
import http import http
import io import io
import re import re
@ -939,7 +940,12 @@ class HTTPConnection:
sys.audit("http.client.connect", self, self.host, self.port) sys.audit("http.client.connect", self, self.host, self.port)
self.sock = self._create_connection( self.sock = self._create_connection(
(self.host,self.port), self.timeout, self.source_address) (self.host,self.port), self.timeout, self.source_address)
# Might fail in OSs that don't implement TCP_NODELAY
try:
self.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) self.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
except OSError as e:
if e.errno != errno.ENOPROTOOPT:
raise
if self._tunnel_host: if self._tunnel_host:
self._tunnel() self._tunnel()

1
Misc/NEWS.d/next/Library/2021-09-30-08-22-44.bpo-45328.8Z-Q0B.rst Normal file
View file

@ -0,0 +1 @@
Fixed :class:`http.client.HTTPConnection` to work properly in OSs that don't support the ``TCP_NODELAY`` socket option.