]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Fri, 6 Apr 2012 13:57:56 +0000 (21:57 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 6 Apr 2012 13:57:56 +0000 (21:57 +0800)
commitb0f09b69d38a05102703329b51d7fae4d2433b54
treead90720b8135ef2329c3c187d61fb9a5679e7687
parent69b2570b72a643f28135ebaf89ab1188d6cd7d45
parent9bf8cd4b3437f6335e20843c9e3668b44761feba
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
main/SAPI.c