Conversation
|
I'm not sure how the test case should look like, but this PR fixes #4485 on v0.12 branch. |
src/tls_wrap.cc
Outdated
There was a problem hiding this comment.
I think you can drop this line now. IIRC, that was a workaround for a false positive in gcc 4.2 or 4.4.
|
LGTM with a suggestion. Maybe it's better to use |
Adopt `MarkPopErrorOnReturn` from `node_crypto.cc`, and use it to clear errors after `SSL_read`/`SSL_write`/`SSL_shutdown` functions. See: nodejs#4485 PR-URL: nodejs#4515 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
c3add8b to
9e1d151
Compare
|
Thank you, force pushed. CI: https://ci.nodejs.org/job/node-test-pull-request/1141/ |
|
Failures seems to be unrelated, but just in case: https://ci.nodejs.org/job/node-test-pull-request/1142/ |
|
LGTM |
|
Landed in 4f87574, thank you! |
Adopt `MarkPopErrorOnReturn` from `node_crypto.cc`, and use it to clear errors after `SSL_read`/`SSL_write`/`SSL_shutdown` functions. See: nodejs#4485 PR-URL: nodejs#4515 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
|
@thealphanerd Argh, is it because of the |
I didn't dig in too deep, but usually those kind of conflicts are due to missing patch's. |
|
@thealphanerd this patch should do it: https://gist.github.com/indutny/41e1992a45b1cb0b062e |
|
making sure we are on the same is the above patch a replacement for this commit or something to put in first? If you don't mind would you be willing to wrap that all up in a single PR and submit against v4.x-staging? |
Adopt `MarkPopErrorOnReturn` from `node_crypto.cc`, and use it to clear errors after `SSL_read`/`SSL_write`/`SSL_shutdown` functions. See: nodejs#4485 PR-URL: nodejs#4515 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
|
@thealphanerd it is just a resolved conflicts. See #4687 |
Adopt `MarkPopErrorOnReturn` from `node_crypto.cc`, and use it to clear errors after `SSL_read`/`SSL_write`/`SSL_shutdown` functions. See: nodejs#4485 PR-URL: nodejs#4515 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Adopt
ClearErrorOnReturnfromnode_crypto.cc, and use it to clearerrors after
SSL_read/SSL_write/SSL_shutdownfunctions.See: #4485