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.

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

Jump to bottom

std::net: Socket::new_raw now set to SO_NOSIGPIPE on freebsd. #124470

Merged
merged 1 commit into from May 8, 2024
Merged

std::net: Socket::new_raw now set to SO_NOSIGPIPE on freebsd. #124470

merged 1 commit into from May 8, 2024

Conversation

devnexen
Copy link
Contributor

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Apr 28, 2024

r? @ChrisDenton

rustbot has assigned @ChrisDenton.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added O-unix Operating system: Unix-like S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Apr 28, 2024
taiki-e
taiki-e reviewed Apr 28, 2024
View reviewed changes
library/std/src/sys/pal/unix/net.rs Outdated
@@ -74,7 +74,6 @@ impl Socket {
if #[cfg(any(
target_os = "android",
target_os = "dragonfly",
target_os = "freebsd",
Copy link
Member

@taiki-e taiki-e Apr 28, 2024 •
edited

Choose a reason for hiding this comment

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

This makes an extra syscall in set_cloexec necessary, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes

@taiki-e
Copy link
Member

taiki-e commented Apr 28, 2024

Btw, NetBSD and DragonFly BSD also support nosigpipe: bytecodealliance/rustix#870

@rustbot
Copy link
Collaborator

rustbot commented Apr 28, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git rebase -i master
$ # delete any merge commits in the editor that appears
$ git push --force-with-lease

The following commits are merge commits:

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 28, 2024
@rustbot rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 28, 2024
@workingjubilee
Copy link
Contributor

@devnexen Thanks for the PR! Pardon me, I seem to be a bit dense today. What does the part of the PR title that says "no set to" mean?

@devnexen
Copy link
Contributor Author

devnexen commented May 5, 2024

Hehe just typo. meant "noW set to"

@devnexen devnexen changed the title std::net: Socket::new_raw no set to SO_NOSIGPIPE on freebsd. std::net: Socket::new_raw now set to SO_NOSIGPIPE on freebsd. May 5, 2024
@workingjubilee
Copy link
Contributor

And it seems this is already done, albeit with very slight API differences, by The Other BSD. Cool, safe to continue doing platform-specific stuff then.

@bors r+ rollup

@workingjubilee
Copy link
Contributor

r? workingjubilee

@rustbot rustbot assigned workingjubilee and unassigned ChrisDenton May 5, 2024
@workingjubilee
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 8, 2024

📌 Commit a25b094 has been approved by workingjubilee

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 8, 2024
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request May 8, 2024
@workingjubilee
Rollup merge of rust-lang#124470 - devnexen:no_sigpipe_fbsd, r=workin…
d970e95 
…gjubilee

std::net: Socket::new_raw now set to SO_NOSIGPIPE on freebsd.
@workingjubilee workingjubilee mentioned this pull request May 8, 2024
Closed
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request May 8, 2024
@workingjubilee
Rollup merge of rust-lang#124470 - devnexen:no_sigpipe_fbsd, r=workin…
91be720 
…gjubilee

std::net: Socket::new_raw now set to SO_NOSIGPIPE on freebsd.
@workingjubilee workingjubilee mentioned this pull request May 8, 2024
Closed
@workingjubilee workingjubilee mentioned this pull request May 8, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2024
@bors
Auto merge of rust-lang#124879 - workingjubilee:rollup-1k77hyz, r=wor…
1fef152 
…kingjubilee

Rollup of 4 pull requests

Successful merges:

 - rust-lang#124470 (std::net: Socket::new_raw now set to SO_NOSIGPIPE on freebsd.)
 - rust-lang#124782 (add note about `AlreadyExists` to `create_new`)
 - rust-lang#124788 (Convert instances of `target_os = "macos"` to `target_vendor = "apple"`)
 - rust-lang#124838 (next_power_of_two: add a doctest to show what happens on 0)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bc42f25 into rust-lang:master May 8, 2024
10 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 8, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2024
@rust-timer
Unrolled build for rust-lang#124470
b40e9f3 
Rollup merge of rust-lang#124470 - devnexen:no_sigpipe_fbsd, r=workingjubilee

std::net: Socket::new_raw now set to SO_NOSIGPIPE on freebsd.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@taiki-e taiki-e taiki-e left review comments

Assignees

@workingjubilee workingjubilee

Labels
O-unix Operating system: Unix-like S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@devnexen @rustbot @taiki-e @workingjubilee @bors @ChrisDenton