From: Anatol Belski <ab@php.net>
Date: Thu, 10 Jul 2014 20:05:15 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af994df8122f99c72b9b1ad3e862ac9bb22c12a1;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  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
  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
  update year & copyright

Conflicts:
	sapi/litespeed/lsapilib.h
---

af994df8122f99c72b9b1ad3e862ac9bb22c12a1