]> granicus.if.org Git - php/commit
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)
commit2f1c11b3e244de763bf12dd96633a1fa7d806bda
tree830cc3bbdf8b1fbbe98bf6af62ae3eaea6b1456a
parentaf994df8122f99c72b9b1ad3e862ac9bb22c12a1
parentfbc21af87b752b99f6b78503cadc89dbba6c98f1
Merge branch 'PHP-5.6'

* PHP-5.6:
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6