From: Anatol Belski <ab@php.net>
Date: Thu, 10 Jul 2014 19:51:32 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.16RC1~53^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc67cf6322178dfa38ddc3428c7ac5934db34cb4;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
---

cc67cf6322178dfa38ddc3428c7ac5934db34cb4