com php-src: Merge branch 'PHP-5.6': sapi/litespeed/lsapilib.c
| From: | Anatol Belski | Date: | Thu, 10 Jul 2014 20:05:15 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': sapi/litespeed/lsapilib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79404@lists.php.net to get a copy of this message | ||
Commit: af994df8122f99c72b9b1ad3e862ac9bb22c12a1
Author: Anatol Belski <ab@php.net> Thu, 10 Jul 2014 22:05:15 +0200
Parents: cf78e8324eca80f1040a844770181b51aaba59fc 552cfcc578b5372ecae08aaf600df8b469f20100
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af994df8122f99c72b9b1ad3e862ac9bb22c12a1
Log:
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
Changed paths:
MM sapi/litespeed/lsapilib.c
Diff: