Sandbox PHP 5.6 using zend_execute_ex + zend_execute_internal #970
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
morrisonlevi
added
💔 breaking-change
🍏 core
morrisonlevi
force-pushed
the
levi/build/sandbox-only-php-5.6
branch
2 times, most recently
from
05ea2ef
to
af62bd8
Compare
SammyK
reviewed
Jul 21, 2020
morrisonlevi
force-pushed
the
levi/build/sandbox-only-php-5.6
branch
from
efc2fe1
to
fbecce1
Compare
SammyK
previously approved these changes
Jul 30, 2020
5 tasks
This drops the legacy API entirely.
morrisonlevi
force-pushed
the
levi/build/sandbox-only-php-5.6
branch
from
fbecce1
to
c88960d
Compare
SammyK
approved these changes
Aug 5, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR changes the engine hooks for PHP 5.6 to use
zend_execute_exandzend_execute_internalinstead of fcall opcode handlers to instrument functions. This gives us the ability to trace calls made bycall_user_funcandcall_user_func_array, and is vastly simpler. It doesn't support the legacy API at all. The span defaults and close at exit features are supported.This did require some other changes such as making a
ddtrace_span_fciobject that backs up various information about the call for the sake of theexithandler. I also deleted some dead code paths on PHP 5.4 because they were giving build errors after making changes.It also fixes a bug in PHP 5.6+ where args that are references weren't passed into the closure's args array correctly as references.
Readiness checklist
Reviewer checklist