Aaron Piotrowski 110e0a5a2c Merge branch 'master' into throwable-interface ... # Conflicts: # Zend/zend_language_scanner.c # Zend/zend_language_scanner.l # ext/simplexml/tests/SimpleXMLElement_xpath.phpt		2015-06-14 18:53:11 -05:00
..
apache2handler	Merge branch 'PHP-5.6'	2015-04-14 01:28:06 -07:00
cgi	Merge branch 'master' into throwable-interface	2015-06-14 18:53:11 -05:00
cli	Merge branch 'master' into throwable-interface	2015-06-14 18:53:11 -05:00
embed	made ZEND_TSRMLS_CACHE_* macros look like function calls	2015-02-16 17:19:32 +01:00
fpm	FIx darwin build	2015-05-31 14:52:08 -07:00
litespeed	Fixed Buf #68812 Unchecked return value.	2015-06-08 15:47:11 -04:00
phpdbg	Add ZEND_ASSERT_CHECK to phpdbg opcode jump list	2015-06-14 04:45:56 +02:00
tests	Fixed sapi/tests (maybe needs some run-test.php people's reviewing)	2015-05-27 17:37:34 +08:00