php-src/sapi
Xinchen Hui da7d94cd73 Merge branch 'PHP-5.6'
Conflicts:
	ext/soap/soap.c
	ext/standard/basic_functions.c
	ext/zlib/zlib.c
2015-02-13 13:28:24 +08:00
..
apache2handler fix values for gid and uid 2015-02-11 11:46:31 +01:00
cgi remove useless condition 2015-02-11 11:46:29 +01:00
cli Merge branch 'PHP-5.6' 2015-02-13 13:28:24 +08:00
embed bump year 2015-01-15 23:27:30 +08:00
fpm Remove useless TSRMLS by merge 2015-02-13 11:02:37 +08:00
litespeed Fixed #68790 (Missing return) 2015-02-07 12:19:53 -05:00
nsapi bump year 2015-01-15 23:27:30 +08:00
phpdbg Merge branch 'PHP-5.6' 2015-02-13 13:28:24 +08:00
tests Revert previous unintentional change to this 2015-01-27 22:19:11 +08:00