Xinchen Hui 90df7e75e6 Merge branch 'master' into merge-fastcgi ... Conflicts: sapi/fpm/fpm/fpm_main.c		2015-05-27 16:36:15 +08:00
..
apache2handler	Merge branch 'PHP-5.6'	2015-04-14 01:28:06 -07:00
cgi	added the shared fcgi imp to sapi/cgi	2015-05-26 09:44:41 +02:00
cli	cleanup more redundant S_IS* declarations	2015-05-25 18:03:26 +02:00
embed	made ZEND_TSRMLS_CACHE_* macros look like function calls	2015-02-16 17:19:32 +01:00
fpm	Merge branch 'master' into merge-fastcgi	2015-05-27 16:36:15 +08:00
litespeed	Fixed a bug that header value is not terminated by '\0' when accessed through getenv().	2015-02-25 11:30:33 -05:00
nsapi	bump year	2015-01-15 23:27:30 +08:00
phpdbg	Remove useless cast	2015-05-27 10:45:19 +08:00
tests	Revert previous unintentional change to this	2015-01-27 22:19:11 +08:00