Reeze Xia c6e415aeb2 Merge branch 'PHP-5.6' ...

* PHP-5.6:
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)

Conflicts:
	main/main.c

2015-03-03 11:44:52 +08:00

..

apache2handler

made ZEND_TSRMLS_CACHE_* macros look like function calls

2015-02-16 17:19:32 +01:00

cgi

made ZEND_TSRMLS_CACHE_* macros look like function calls

2015-02-16 17:19:32 +01:00

cli

Merge branch 'PHP-5.6'

2015-03-03 11:44:52 +08:00

embed

made ZEND_TSRMLS_CACHE_* macros look like function calls

2015-02-16 17:19:32 +01:00

fpm

- Fix merge

2015-02-16 12:21:20 -02: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

Added specialized versions of DO_FCALL handler:

2015-02-25 10:37:21 +03:00

tests

Revert previous unintentional change to this

2015-01-27 22:19:11 +08:00