php-src/main
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
..
streams Removed zend_fcall_info.symbol_table 2016-03-02 17:50:55 +03:00
alloca.c
build-defs.h.in Merge branch 'PHP-5.6' into PHP-7.0 2016-01-04 18:13:38 +01:00
fastcgi.c Also WIN32 side 2016-01-29 20:38:50 -08:00
fastcgi.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
fopen_wrappers.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
fopen_wrappers.h Remove version checks 2016-01-30 15:35:28 +01:00
getopt.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
http_status_codes.h Happy new year (Update copyright to 2016) 2016-01-01 20:03:16 +02:00
internal_functions_nw.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
internal_functions_win32.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
internal_functions.c.in Merge branch 'PHP-5.6' into PHP-7.0 2016-01-04 18:13:38 +01:00
main.c Merge branch 'PHP-5.6' into PHP-7.0 2016-02-18 19:14:22 +01:00
mergesort.c first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
network.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
output.c Remove TSRMLS_* from code, they are not used anymore 2016-02-17 22:44:05 -08:00
php_compat.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_content_types.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_content_types.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_getopt.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_globals.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_ini.c Merge branch 'PHP-7.0' 2016-01-01 20:04:31 +02:00
php_ini.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_main.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_memory_streams.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_network.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_open_temporary_file.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_open_temporary_file.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_output.h Fix bug #71575 removing extra semicolons outside macros 2016-03-03 16:41:03 +01:00
php_reentrancy.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_scandir.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_scandir.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_sprintf.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_stdint.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_streams.h Eliminate usages of _PP macros 2016-03-03 23:20:12 +01:00
php_syslog.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_ticks.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_ticks.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_variables.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_variables.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
php_version.h 5.6.20 is next 2016-02-18 00:31:18 +01:00
php.h Merge branch 'PHP-7.0' 2016-02-14 14:47:42 +01:00
reentrancy.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
rfc1867.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
rfc1867.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
SAPI.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
SAPI.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
snprintf.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
snprintf.h Remove use of register keyword in headers 2016-02-04 13:34:19 +01:00
spprintf.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
spprintf.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
strlcat.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
strlcpy.c Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
win95nt.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00