]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b4b70d 3332943)
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Sat, 12 May 2012 05:19:27 +0000 (13:19 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 12 May 2012 05:19:55 +0000 (13:19 +0800)
commit6a5095582a1e3b9a065863c9990e2f001d1cdc10
tree02f7ef0e86786b894b7e9704e95b0dfd498e0a26tree | snapshot
parent8b4b70df56e14be0f7172b5cc5f8da44b3272ac3commit | diff
parent3332943c9d20a8b5e09816b11f38742de0e16085commit | diff
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
  fix stack overflow in php_intlog10abs()

Conflicts:
Zend/zend_execute.c
NEWS diff1 | diff2 | blob | history
Zend/tests/bug62005.phpt | diff2 | blob | history
Zend/zend_execute.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.