Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: PHP-5.4

Mar 24, 2012

  1. Hannes Magnusson

    Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      This is a git checkout
      Revert incorrect fix
    bjori authored
  2. Hannes Magnusson

    This is a git checkout

    bjori authored
  3. Revert incorrect fix

    Ilia Alshanetsky authored
  4. David Soria Parra

    Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
    dsp authored
  5. David Soria Parra

    Merge commit '521ebec3e9bcd4fa75772d2bfa57a733dfe1d5fa' into PHP-5.3

    This merge combines a accidentaly separated head, leading to two duplicated
    commits in history (again).
    
    * commit '521ebec3e9bcd4fa75772d2bfa57a733dfe1d5fa':
      Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
    dsp authored
  6. Xinchen Hui

    Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NU…

    …LL)"
    
    This reverts commit fcae164.
    laruence authored
  7. Xinchen Hui

    Revert "Update NEWS"

    This reverts commit 88a8085.
    laruence authored
  8. Xinchen Hui

    Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4

    laruence authored
  9. Xinchen Hui

    Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NU…

    …LL)"
    
    This reverts commit fcae164.
    laruence authored
  10. Xinchen Hui

    Revert "Merge from PHP-5.4"

    This reverts commit 9a87fe1.
    laruence authored
  11. Xinchen Hui

    Update NEWS

    laruence authored
  12. Xinchen Hui

    Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4

    laruence authored
  13. Xinchen Hui

    Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)

    laruence authored
  14. Xinchen Hui

    Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4

    laruence authored
  15. Xinchen Hui

    Merge from PHP-5.4

    Improve set_exception_handler
    laruence authored
  16. Xinchen Hui

    Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4

    laruence authored
  17. Xinchen Hui

    Fix ZTS build

    laruence authored
  18. Xinchen Hui

    Typo

    laruence authored
  19. Xinchen Hui

    Fix test

    laruence authored
  20. Xinchen Hui

    Improve set_exception_handler

    Remove useless alloc/free and return_value copy while doing reset
    exception handler
    laruence authored
  21. Xinchen Hui

    Remove empty lines

    laruence authored

Mar 23, 2012

  1. Gustavo Lopes

    Merge branch '5.3' into 5.4

    cataphract authored
  2. Gustavo Lopes

    Merge branch 'dom_debug_handler' into 5.3

    cataphract authored
  3. Gustavo Lopes

    Updated NEWS (DOM object debug info handler).

    cataphract authored
  4. Gustavo Lopes

    Fixed tests that var_dump/print_r DOM objects.

    cataphract authored
  5. Gustavo Lopes

    Improved on DOM object debug info handler. Added test.

    cataphract authored
  6. Joey Smith

    Added DOM Debug handler

    tml authored cataphract committed
  7. Gustavo Lopes

    Merge branch '5.3' into 5.4

    cataphract authored
  8. Gustavo Lopes

    Fixed bug #61482, caused by the fix to bug #61418.

    Turns out I'd forgotten to also update the destructor for the iterator
    returned by DirectoryIterator.
    The iterator for DirectoryIterator maintains the same ->current pointer
    throughout its existence (the DirectoryIterator itself) and returns it
    (the same object) everytime a value is requested from the iterator.
    Moving forward the iterator only changes the object. Previous code
    added two references to the object in get_iterator on the account of
    1) the iterator memory living in its DirectoryIterator object and
    2) the object being stored in iterator->current. This seems to be
    unnecessary. Iterators are not responsible for incrementing the refcount
    of the values they yield, that's up to the caller (the engine). What
    matters for the iterator is that the object exists as long as the
    iterator exists and this can be guaranteed by incremented the refcount
    only once. Consequently, I only add one reference in get_iterator
    (and reclaim it in the iterator destructor).
    cataphract authored
  9. Gustavo Lopes

    Revert "Revert "- Fixed bug #61418 (Segmentation fault when Directory…

    …Iterator's or" - causes bug #61482"
    
    This reverts commit a89c4a3.
    cataphract authored
  10. Gustavo Lopes

    Revert "revert from NEWS too"

    This reverts commit 4990250.
    cataphract authored
  11. Stanislav Malyshev

    revert from NEWS too

    smalyshev authored
  12. Stanislav Malyshev

    Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
      Add initialization tests for SQLT_INT binds
      Fix NEWS
    smalyshev authored
  13. Stanislav Malyshev

    Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator…

    …'s or" - causes bug #61482
    
    This reverts commit 714f1ff.
    smalyshev authored
  14. Stanislav Malyshev

    update for git

    smalyshev authored
Something went wrong with that request. Please try again.