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

Fix Configure death handler #6776

Closed
wants to merge 3 commits into from
Closed

Fix Configure death handler #6776

wants to merge 3 commits into from

Conversation

levitte
Copy link
Member

@levitte levitte commented Jul 24, 2018

A couple of details weren't quite right.

@levitte levitte added branch: master Merge to master branch 1.1.0 branch: 1.1.1 Merge to OpenSSL_1_1_1-stable branch labels Jul 24, 2018
@richsalz
Copy link
Contributor

I applied the patch and it still doesn't work.

@levitte levitte force-pushed the fix-Configure-death-handler-20180724 branch from 2567688 to d41faed Compare July 24, 2018 17:38
@levitte levitte requested a review from richsalz July 24, 2018 17:38
@levitte
Copy link
Member Author

levitte commented Jul 24, 2018

Well, uhmmm, I didn't really expect it to. However, this change makes Configure play nicer with Carp::Always, which can then help writing stack traces any time die is called, and thereby maybe help us figure out what your issue is.

For everyone else listening, this is related to this discussion on openssl-project

@levitte
Configure death handler: instead of printing directly, amend the message
b146a98 
This is done by calling die again, just make sure to reset the __DIE__
handler first.
richsalz
richsalz approved these changes Jul 24, 2018
View reviewed changes
Copy link
Contributor

@richsalz richsalz left a comment

Choose a reason for hiding this comment

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

Fixes my breakage. :)

@richsalz richsalz added the approval: done This pull request has the required number of approvals label Jul 24, 2018
@levitte
Copy link
Member Author

levitte commented Jul 24, 2018

... which, incidently, wasn't a breakage at all, just [ahem] rogue output ;-)

levitte added a commit that referenced this pull request Jul 24, 2018
@levitte
Configure death handler: bail out early when run in eval block
1a6c300 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #6776)
levitte added a commit that referenced this pull request Jul 24, 2018
@levitte
Configure death handler: remember to call original death handler
88accfe 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #6776)
levitte added a commit that referenced this pull request Jul 24, 2018
@levitte
Configure death handler: instead of printing directly, amend the message
eb807d5 
This is done by calling die again, just make sure to reset the __DIE__
handler first.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #6776)
levitte added a commit that referenced this pull request Jul 24, 2018
@levitte
Configure death handler: bail out early when run in eval block
64eae74 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #6776)

(cherry picked from commit 1a6c300)
levitte added a commit that referenced this pull request Jul 24, 2018
@levitte
Configure death handler: remember to call original death handler
f65389a 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #6776)

(cherry picked from commit 88accfe)
levitte added a commit that referenced this pull request Jul 24, 2018
@levitte
Configure death handler: instead of printing directly, amend the message
36e732b 
This is done by calling die again, just make sure to reset the __DIE__
handler first.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #6776)

(cherry picked from commit eb807d5)
@levitte
Copy link
Member Author

levitte commented Jul 24, 2018

Merged.

master / 1.1.1:
eb807d5 Configure death handler: instead of printing directly, amend the message
88accfe Configure death handler: remember to call original death handler
1a6c300 Configure death handler: bail out early when run in eval block

1.1.0:
36e732b Configure death handler: instead of printing directly, amend the message
f65389a Configure death handler: remember to call original death handler
64eae74 Configure death handler: bail out early when run in eval block

@levitte levitte closed this Jul 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richsalz richsalz richsalz approved these changes

Assignees
No one assigned
Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch branch: 1.1.1 Merge to OpenSSL_1_1_1-stable branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@levitte @richsalz