php-src/main
Xinchen Hui 6b83832cf4 Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	main/streams/xp_socket.c
2016-06-18 21:33:54 -07:00
..
streams Merge branch 'PHP-5.6' into PHP-7.0 2016-06-18 21:33:54 -07: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 Fixed bug #72308 (fastcgi_finish_request and logging environment variables) 2016-06-02 14:16:32 +08:00
fastcgi.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
fopen_wrappers.c simplify expression 2016-04-28 15:52:30 +01:00
fopen_wrappers.h Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02: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 Fixed bug #71891 (header_register_callback() and register_shutdown_function()) 2016-03-25 12:34:22 +08:00
mergesort.c first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
network.c Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes) 2016-05-16 11:19:45 +08: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-5.6' into PHP-7.0 2016-01-01 19:48:25 +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 This is exported at implementation site, but no forward declaration can cause compile warnings 2016-05-29 06:02:38 +01: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.24 will be next 2016-06-09 10:51:02 +02:00
php.h Fix format attributes in ZTS 2016-02-14 14:44:27 +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 fix #70189 (SAPI sends empty Content-Type when default_mimetype is empty) 2016-03-27 06:50:11 +01: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 Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02: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