diff options
| author | Anatol Belski <ab@php.net> | 2014-07-10 21:51:32 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-10 21:51:32 +0200 |
| commit | cc67cf6322178dfa38ddc3428c7ac5934db34cb4 (patch) | |
| tree | 08013759978a8168d3bc75642c41282f1e09f567 /sapi/cli/php_cli_server.c | |
| parent | 40d11cc822f7f5e3620ba03351a7f8053960bcd0 (diff) | |
| parent | 1f90dd3359df540842ba29d0b3eb087195669b36 (diff) | |
| download | php-git-cc67cf6322178dfa38ddc3428c7ac5934db34cb4.tar.gz | |
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
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions