]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69b2570 9bf8cd4)
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)
* PHP-5.3:
  Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))

1  2 
main/SAPI.c patch | diff1 | diff2 | blob | history

diff --cc main/SAPI.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.