]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40d11cc 1f90dd3)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 19:51:32 +0000 (21:51 +0200)
committerAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 19:51:32 +0000 (21:51 +0200)
* 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

1  2 
win32/build/confutils.js patch | diff1 | diff2 | blob | history

diff --cc win32/build/confutils.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.