php-src/sapi
Nikita Popov 7ed893712f Merge branch 'PHP-7.0'
Conflicts:
	ext/mysqlnd/mysqlnd_priv.h
	main/php_streams.h
2016-03-03 23:20:50 +01:00
..
apache2handler Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE 2016-03-03 16:50:01 +01:00
cgi Merge branch 'PHP-7.0' 2016-03-03 16:50:47 +01:00
cli Merge branch 'PHP-7.0' 2016-03-03 19:27:41 +01:00
embed Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE 2016-03-03 16:50:01 +01:00
fpm fpm: call zend_signal_init() in child 2016-02-15 13:23:37 +08:00
litespeed Merge branch 'PHP-7.0' 2016-02-08 20:33:17 +02:00
phpdbg Merge branch 'PHP-7.0' 2016-03-03 23:20:50 +01:00
tests Merge branch 'PHP-5.6' 2015-08-11 01:42:25 +02:00