php-src/main
Xinchen Hui 3994a70b91 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)
  fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)
  fix #72206 (xml_parser_create/xml_parser_free leaks mem)
  improve 7132fe19c2
  fix 1bb8a7b0b8
  fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)

Conflicts:
	acinclude.m4
2016-05-16 11:21:39 +08:00
..
streams Implement #51879 stream context socket option tcp_nodelay 2016-04-29 12:11:58 +01: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 fix #71609: Segmentation fault on ZTS with gethostbyname 2016-03-31 12:39:01 +01: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 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 Safe execution timeout handling. 2016-04-20 13:52:21 +03:00
mergesort.c first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
network.c Merge branch 'PHP-7.0' 2016-05-16 11:21:39 +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 Safe execution timeout handling. 2016-04-20 13:52:21 +03: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 Implement #51879 stream context socket option tcp_nodelay 2016-04-29 12:11:58 +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 prepare next 7.0.8 2016-05-10 13:06:55 +02: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 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 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