com php-src: Merge branch 'PHP-5.4' into PHP-5.5: win32/build/confutils.js
| From: | Anatol Belski | Date: | Thu, 10 Jul 2014 19:51:32 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79403@lists.php.net to get a copy of this message | ||
Commit: cc67cf6322178dfa38ddc3428c7ac5934db34cb4
Author: Anatol Belski <ab@php.net> Thu, 10 Jul 2014 21:51:32 +0200
Parents: 40d11cc822f7f5e3620ba03351a7f8053960bcd0 1f90dd3359df540842ba29d0b3eb087195669b36
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cc67cf6322178dfa38ddc3428c7ac5934db34cb4
Log:
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
Changed paths:
MM win32/build/confutils.js
Diff: