Skip to content

Conversation

kalaspuffar
Copy link

Tried to solve bug #52098 by adding a fallback so the get_method handler of the class also runs the standard get_method handler and returns the result of this call when a database function could not be found.

dstogov and others added 30 commits September 22, 2015 15:51
and also keep the indices of func_get_args(). since they are similar
issue of #70574, thus reuse its test script.
* PHP-5.6:
  add missing header
  silence mkdir to fix fails after unclean test run
* PHP-5.6:
  Fix bug #64172
  Bug #70561: Fix DirectoryIterator to throw OutOfBoundsException

Conflicts:
	ext/pdo/pdo_dbh.c
@smalyshev
Copy link
Contributor

Could you please rebase the patch? Right now it seems to be unmergeable and contains broken pieces.

Tyrael and others added 11 commits October 19, 2015 07:19
Assert that a live-range does not start, while one for the same
variable is already active.

To satisfy this constraint, explicitly exclude writes from JMP_SET
and COALESCE. They were previously also handled correctly, because
their result variable was only killed after the second write to it
after the false branch. This just makes it more explicit.
@kalaspuffar kalaspuffar deleted the bug_52098_php7 branch October 19, 2015 05:49
weltling and others added 14 commits October 19, 2015 07:50
… a part of the fix serious refactoring was done. op_array->brk_cont_array was removed, and replaced with more general and speed efficient op_array->T_liveliness. ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time). (Bob, Dmitry, Laruence)"

This reverts commit 5ee8413.
… into bug_52098_php7

* 'bug_52098_php7' of https://github.com/kalaspuffar/php-src: (40 commits)
  Changes to pass all tests
  fix NEWS
  fix test
  bump versions
  Added fallback for get_method so we run the standard get_method and trigger overloaded methods
  fix regressio introduce in 22e23e7
  bump release version
  sync NEWS
  bump version
  update NEWS
  Fixed bug #70293 (Crash with specific assertions and zend.assertions=-1)
  Fixed memleak in Zend/tests/bug39297
  add NEWS entry
  Fixed bug #70288 (Apache crash related to ZEND_SEND_REF)
  sync NEWS
  bump versions
  sync NEWS
  sync NEWS
  set versions
  fix merge mistake
  ...
@kalaspuffar kalaspuffar restored the bug_52098_php7 branch October 19, 2015 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.