]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e33e4b2 37a685f)
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Sun, 12 Oct 2014 04:55:24 +0000 (12:55 +0800)
committerTjerk Meesters <datibbaw@php.net>
Sun, 12 Oct 2014 04:55:24 +0000 (12:55 +0800)
commitea7604fc9e481318d9219bcc8b29125079965895
tree196d3cdad28f1758bfd06e92339b565de17368fftree | snapshot
parente33e4b2d8c44fb04afc54f688ed44dce7e8a2e0fcommit | diff
parent37a685ff2bed7bda213c53604ad8cc6dc470751ccommit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  More fixes for nodelist array access
  - testing for null property read
  - no zval copying if the type is already long
  - memory fix for master
  - use zend_long for offset

Conflicts:
ext/dom/php_dom.c
ext/dom/php_dom.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.