]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 22 May 2012 16:43:10 +0000 (18:43 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 22 May 2012 16:43:10 +0000 (18:43 +0200)
commit29876c5c29e737158ecfeb32a59b5bfb0607723b
treee07d365022673f7fb156d3f3b49f40d12e897c36
parentbdf0c9ccbe2fc96fbd12467dc1666ca1ac7c2c6b
parent621fddab93468219aafb0392c7056e551defa1fa
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #62109 tests\basic\bug46313-win.phpt fails
  - Fixed bug #61045 (fpm don't send error log to fastcgi clients)