Skip to content

[3.14] Try to fix the fix for gh-119452 #142180

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

Closed
serhiy-storchaka wants to merge 2 commits into from
Closed

[3.14] Try to fix the fix for gh-119452 #142180

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f00ef9f
[3.14] Try to fix the fix for gh-119452
serhiy-storchaka Dec 2, 2025
769972c
Simply use non-zero timeout.
serhiy-storchaka Dec 2, 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
8 changes: 4 additions & 4 deletions Lib/http/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,16 +1288,16 @@ def run_cgi(self):
env = env
)
if self.command.lower() == "post" and nbytes > 0:
cursize = 0
data = self.rfile.read(min(nbytes, _MIN_READ_BUF_SIZE))
while (len(data) < nbytes and len(data) != cursize and
cursize = min(nbytes, _MIN_READ_BUF_SIZE)
data = self.rfile.read(cursize)
while (len(data) == cursize < nbytes and
Copy link
Member

@encukou encukou Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

len(data) == cursize means that we're expecting that cursize bytes of the data arrive over the socket simultaneously, right?

Copy link
Member Author

@serhiy-storchaka serhiy-storchaka Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, and this assumption was incorrect. There was another bug in the old code -- it did not work on Linux without fork(), because read(n) could return less than n bytes. #119455 fixed it, and we need to preserve this fix. I restored that code and try another approach -- using non-zero timeout.

select.select([self.rfile._sock], [], [], 0)[0]):
cursize = len(data)
# This is a geometric increase in read size (never more
# than doubling our the current length of data per loop
# iteration).
delta = min(cursize, nbytes - cursize)
data += self.rfile.read(delta)
cursize += delta
else:
data = None
# throw away additional data [see bug #427345]
Expand Down
Loading