]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:17:46 +0000 (22:17 +0200)
committerAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:17:46 +0000 (22:17 +0200)
* PHP-5.6:
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6


Trivial merge