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.

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

[3.15] backport #10333 #10431

Merged
merged 4 commits into from Apr 17, 2024
Merged

[3.15] backport #10333 #10431

merged 4 commits into from Apr 17, 2024

Conversation

emillon
Copy link
Collaborator

@emillon emillon commented Apr 17, 2024

@emillon emillon mentioned this pull request Apr 17, 2024
14 tasks
Copy link
Collaborator

@Leonidas-from-XIV Leonidas-from-XIV left a comment

Choose a reason for hiding this comment

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

I missed this one before.

10333.md Outdated Show resolved Hide resolved
emillon and others added 4 commits April 17, 2024 14:13
See ocaml#10333

Signed-off-by: Etienne Millon <me@emillon.org>
…docker (ocaml#10333)

* fix: sendfile() in docker

Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com>

* use ssize_t for return value

Co-authored-by: Etienne Millon <etienne.millon@gmail.com>
Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com>

* update test

Signed-off-by: Etienne Millon <me@emillon.org>

* Add changelog

Signed-off-by: Etienne Millon <me@emillon.org>

---------

Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com>
Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com>
Signed-off-by: Etienne Millon <me@emillon.org>
Co-authored-by: Etienne Millon <etienne.millon@gmail.com>
Co-authored-by: Etienne Millon <me@emillon.org>
Signed-off-by: Etienne Millon <me@emillon.org>
Signed-off-by: Etienne Millon <me@emillon.org>
@emillon emillon merged commit f434ff8 into ocaml:3.15 Apr 17, 2024
25 of 27 checks passed
@emillon emillon deleted the backport-10333 branch April 17, 2024 12:24
Comment on lines +21 to +22

(3 indicates that the file size is taken modulo 2**32)
Copy link
Collaborator

Choose a reason for hiding this comment

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

We forgot removing this line.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

indeed. can you remove it on main?

Copy link
Collaborator

Choose a reason for hiding this comment

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

OK

Copy link
Collaborator

Choose a reason for hiding this comment

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

Done in #10437

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants