]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cf78e83 552cfcc)
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:05:15 +0000 (22:05 +0200)
committerAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:05:15 +0000 (22:05 +0200)
commitaf994df8122f99c72b9b1ad3e862ac9bb22c12a1
tree830cc3bbdf8b1fbbe98bf6af62ae3eaea6b1456atree | snapshot
parentcf78e8324eca80f1040a844770181b51aaba59fccommit | diff
parent552cfcc578b5372ecae08aaf600df8b469f20100commit | diff
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
sapi/litespeed/lsapilib.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.