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

Avoid a possible deadlock in main_fetch's synchronous code. #13388

Merged
merged 1 commit into from Sep 24, 2016
Merged

Conversation

@Ms2ger
Copy link
Contributor

Ms2ger commented Sep 23, 2016

On playpen, similar code caused a deadlock on 1.11 stable, and worked fine
on nightly 1.13; it seems safer to avoid the pattern entirely.


This change is Reviewable

On playpen, similar code caused a deadlock on 1.11 stable, and worked fine
on nightly 1.13; it seems safer to avoid the pattern entirely.
@highfive
Copy link

highfive commented Sep 23, 2016

Heads up! This PR modifies the following files:

@highfive
Copy link

highfive commented Sep 23, 2016

warning Warning warning

  • These commits modify net code, but no tests are modified. Please consider adding a test!
@emilio
Copy link
Member

emilio commented Sep 23, 2016

@bors-servo: r+

Yeah, I think the lifetime of the objects in if conditions was fixed not so long ago, so agreed.

@bors-servo
Copy link
Contributor

bors-servo commented Sep 23, 2016

📌 Commit ccfd977 has been approved by emilio

@highfive highfive assigned emilio and unassigned jdm Sep 23, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Sep 24, 2016

Testing commit ccfd977 with merge 1d5a05d...

bors-servo added a commit that referenced this pull request Sep 24, 2016
Avoid a possible deadlock in main_fetch's synchronous code.

On playpen, similar code caused a deadlock on 1.11 stable, and worked fine
on nightly 1.13; it seems safer to avoid the pattern entirely.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13388)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 24, 2016

@bors-servo bors-servo merged commit ccfd977 into master Sep 24, 2016
2 of 4 checks passed
2 of 4 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
dependency-ci Failed dependency checks
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Ms2ger Ms2ger deleted the deadlock branch Sep 27, 2016
@Ms2ger Ms2ger mentioned this pull request Nov 7, 2016
31 of 31 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.