Skip to content

gh-99813: Start using SSL_sendfile when available #99907

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
merged 55 commits into from
Jul 12, 2025
Merged

gh-99813: Start using SSL_sendfile when available #99907

Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
a018beb
Add methods for checking whether kTLS is used
illia-v Sep 11, 2022
72e7f5e
Start using `SSL_sendfile` when available
illia-v Nov 30, 2022
cf24d78
Try fixing warnings
illia-v Dec 5, 2022
e9ef747
Use unsigned `size_t` instead of `Py_ssize_t`
illia-v Dec 5, 2022
646d328
Merge branch 'main' into SSL_sendfile
illia-v Dec 5, 2022
76353c7
Merge branch 'main'
illia-v Mar 13, 2023
14832de
Make `sendfile_impl` more similar to `write_impl`
illia-v Mar 13, 2023
6b41d31
Modify `test_ssl` to test `SSL_sendfile` calls
illia-v Mar 13, 2023
8ac6ff9
Modify documentation and add a news entry
illia-v Mar 13, 2023
5cf9483
Fix a test
illia-v Mar 13, 2023
fc8e82f
Rename `uses_ktls_for_write` to `uses_ktls_for_send`
illia-v Mar 13, 2023
7fc9b50
Merge branch 'main' into SSL_sendfile
illia-v Jul 25, 2023
1ba04ae
Update `versionchanged`
illia-v Jul 25, 2023
365e0c0
Update a test to get successful HTTP responses
illia-v Jul 25, 2023
8fbc955
Add setting errors
illia-v Jul 25, 2023
21ea0ca
Fix conditions
illia-v Jul 25, 2023
17d9685
Add handling of `SSL_R_UNINITIALIZED`
illia-v Jul 26, 2023
a92ae7e
Merge branch 'main' into SSL_sendfile
illia-v Jul 26, 2023
4e8b6d8
Modify `test_sendfile` to avoid the internet
illia-v Jul 26, 2023
379d242
Refactor `test_sendfile` a bit
illia-v Jul 26, 2023
7de3dcb
Merge branch 'main' into SSL_sendfile
illia-v Oct 4, 2023
bbe21c0
Merge branch 'main' into SSL_sendfile
illia-v Oct 19, 2023
7323ec0
Try to fix new warnings
illia-v Oct 19, 2023
2dc6947
Merge branch 'main' into SSL_sendfile
illia-v Feb 27, 2024
6e902ad
Merge branch 'main' into SSL_sendfile
illia-v Mar 27, 2024
e435b9a
Apply a change from ea9a296fce2f786b4cf43c7924e5de01061f27ca
illia-v Mar 27, 2024
ac1b2b2
Merge branch 'main' into SSL_sendfile
illia-v Jun 6, 2024
7d11a59
Merge branch 'main' into SSL_sendfile
illia-v Jul 31, 2024
99e89d3
Merge branch 'main' into SSL_sendfile
illia-v Sep 28, 2024
dc626c8
Merge branch 'main' into SSL_sendfile
illia-v Dec 27, 2024
291a5b7
Set `versionchanged` to next in docs
illia-v Dec 27, 2024
3193ba4
Merge branch 'main' into SSL_sendfile
illia-v Feb 3, 2025
d870f92
Merge branch 'main' into SSL_sendfile
illia-v Apr 10, 2025
94e522e
Apply some suggestions from code review
illia-v Apr 12, 2025
25bde6f
Apply suggestions to Python code
illia-v Apr 12, 2025
9a6a120
Improve style of `_ssl__SSLSocket_sendfile_impl`
illia-v Apr 12, 2025
eaa0b2c
Merge branch 'main' into SSL_sendfile
illia-v Apr 12, 2025
05a0c6c
Drop `_sendfile_use_ssl_sendfile`
illia-v Apr 13, 2025
6b4eed6
Merge remote-tracking branch 'python/main' into SSL_sendfile
illia-v Apr 13, 2025
31ed52d
Apply suggestions from code review
illia-v Apr 18, 2025
5a22e6b
Merge branch 'main' into SSL_sendfile
illia-v Apr 18, 2025
ada3f30
Improve kTLS checks for older OpenSSL
illia-v Apr 18, 2025
3350854
Merge branch 'main' into SSL_sendfile
illia-v Apr 28, 2025
3339673
Rename `uses_ktls_for_read` to `uses_ktls_for_recv`
illia-v Apr 28, 2025
ee573ad
Apply PEP 7
illia-v Apr 28, 2025
6795f62
Use an alternative method of returning booleans
illia-v Apr 28, 2025
6a35ac6
Mark new functions with `critical_section`
illia-v May 2, 2025
9dffdbd
Merge two if blocks
illia-v May 2, 2025
19d5746
Reword docs
illia-v May 2, 2025
ef3744e
Update the news entry
illia-v May 2, 2025
e64f329
Use `Py_RETURN_FALSE` again
illia-v May 2, 2025
028067a
Merge remote-tracking branch 'python/main' into SSL_sendfile
illia-v May 2, 2025
6e099fa
Merge branch 'main' into SSL_sendfile
illia-v May 5, 2025
f363ec3
Merge branch 'main' into SSL_sendfile
illia-v May 19, 2025
7c071fd
Merge branch 'main' into SSL_sendfile
picnixz Jul 12, 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
Prev Previous commit
Next Next commit
Fix conditions
  • Loading branch information
@illia-v
illia-v committed Jul 25, 2023
commit 21ea0ca3f10929dd3fe81455998253d3687bf1b0
4 changes: 2 additions & 2 deletions Modules/_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2468,7 +2468,7 @@ _ssl__SSLSocket_sendfile_impl(PySSLSocket *self, int fd, Py_off_t offset,
do {
PySSL_BEGIN_ALLOW_THREADS
retval = SSL_sendfile(self->ssl, fd, offset, size, flags);
err = _PySSL_errno(retval <= 0, self->ssl, retval);
err = _PySSL_errno(retval < 0, self->ssl, retval);
PySSL_END_ALLOW_THREADS
self->err = err;

Expand Down Expand Up @@ -2502,7 +2502,7 @@ _ssl__SSLSocket_sendfile_impl(PySSLSocket *self, int fd, Py_off_t offset,
err.ssl == SSL_ERROR_WANT_WRITE);

Py_XDECREF(sock);
if (retval <= 0)
if (retval < 0)
return PySSL_SetError(self, retval, __FILE__, __LINE__);
if (PySSL_ChainExceptions(self) < 0)
return NULL;
Expand Down