]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7f89bc 7616031)
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Thu, 21 Feb 2013 08:57:52 +0000 (00:57 -0800)
committerStanislav Malyshev <stas@php.net>
Thu, 21 Feb 2013 08:57:52 +0000 (00:57 -0800)
* PHP-5.5:
  news for bug #49348
  fix tests
  fix bug #49348 - issue notice on get_property_ptr_ptr when used for read

1  2 
Zend/zend_vm_def.h patch | diff1 | diff2 | blob | history
Zend/zend_vm_execute.h patch | diff1 | diff2 | blob | history
ext/zip/php_zip.c patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
diff --cc ext/zip/php_zip.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.