Michael Wallner f9fda21667 Merge branch 'PHP-5.6' ... * PHP-5.6: BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir) reorder restore API compatibility finish refactor php_stream_temp_create{,_ex} and use it for the php://input stream refactor _php_stream_fopen_{temporary_,tmp}file() fix length overflow of HTTP_RAW_POST_DATA Conflicts: main/php_content_types.c		2014-07-03 20:43:12 +02:00
..
streams	Merge branch 'PHP-5.6'	2014-07-03 20:43:12 +02:00
alloca.c	- Fix outside-source-tree builds. Always include generated header files	2005-01-09 21:05:06 +00:00
build-defs.h.in	Expose PHP_MANDIR	2011-04-18 09:50:32 +00:00
fopen_wrappers.c	Bump year	2014-01-03 11:08:10 +08:00
fopen_wrappers.h	Bump year	2014-01-03 11:08:10 +08:00
getopt.c	Bump year	2014-01-03 11:08:10 +08:00
internal_functions_nw.c	Bump year	2014-01-03 11:08:10 +08:00
internal_functions_win32.c	Bump year	2014-01-03 11:08:10 +08:00
internal_functions.c.in	- MFH Cleanup exports and allow to overwrite ext registration	2008-08-22 12:59:46 +00:00
main.c	Merge branch 'PHP-5.6'	2014-03-27 17:21:23 +09:00
mergesort.c	- MFH Cleanup exports and allow to overwrite ext registration	2008-08-22 12:59:46 +00:00
network.c	Bump year	2014-01-03 11:08:10 +08:00
output.c	Merge branch 'PHP-5.4' into PHP-5.5	2014-04-03 10:40:20 +02:00
php_compat.h	Bump year	2014-01-03 11:08:10 +08:00
php_content_types.c	fix length overflow of HTTP_RAW_POST_DATA	2014-07-03 20:40:40 +02:00
php_content_types.h	Bump year	2014-01-03 11:08:10 +08:00
php_getopt.h	Bump year	2014-01-03 11:08:10 +08:00
php_globals.h	Merge branch 'PHP-5.6'	2014-02-13 11:56:54 +09:00
php_ini.c	Merge branch 'PHP-5.6'	2014-01-29 15:32:02 +02:00
php_ini.h	Bump year	2014-01-03 11:08:10 +08:00
php_main.h	Bump year	2014-01-03 11:08:10 +08:00
php_memory_streams.h	restore API compatibility	2014-07-03 20:40:41 +02:00
php_network.h	Bump year	2014-01-03 11:08:10 +08:00
php_open_temporary_file.c	Bump year	2014-01-03 11:08:10 +08:00
php_open_temporary_file.h	Bump year	2014-01-03 11:08:10 +08:00
php_output.h	Bump year	2014-01-03 11:08:10 +08:00
php_reentrancy.h	Bump year	2014-01-03 11:08:10 +08:00
php_scandir.c	Bump year	2014-01-03 11:08:10 +08:00
php_scandir.h	Bump year	2014-01-03 11:08:10 +08:00
php_sprintf.c	Bump year	2014-01-03 11:08:10 +08:00
php_stdint.h	Bump year	2014-01-03 11:08:10 +08:00
php_streams.h	Merge branch 'PHP-5.5' into PHP-5.6	2014-04-20 15:27:39 -07:00
php_syslog.h	Bump year	2014-01-03 11:08:10 +08:00
php_ticks.c	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
php_ticks.h	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
php_variables.c	Merge branch 'PHP-5.6'	2014-04-24 10:53:31 +02:00
php_variables.h	fix dll export	2014-04-24 10:51:42 +02:00
php_version.h	5.5.15 now	2014-06-11 10:21:26 +02:00
php.h	Merge branch 'PHP-5.6'	2014-02-13 11:56:54 +09:00
reentrancy.c	Bump year	2014-01-03 11:08:10 +08:00
rfc1867.c	Bump year	2014-01-03 11:08:10 +08:00
rfc1867.h	Bump year	2014-01-03 11:08:10 +08:00
SAPI.c	Merge branch 'PHP-5.6'	2014-07-03 20:43:12 +02:00
SAPI.h	Merge branch 'PHP-5.6'	2014-02-13 11:56:54 +09:00
snprintf.c	Bump year	2014-01-03 11:08:10 +08:00
snprintf.h	Bump year	2014-01-03 11:08:10 +08:00
spprintf.c	Bump year	2014-01-03 11:08:10 +08:00
spprintf.h	Bump year	2014-01-03 11:08:10 +08:00
strlcat.c	Bump year	2014-01-03 11:08:10 +08:00
strlcpy.c	Bump year	2014-01-03 11:08:10 +08:00
win32_internal_function_disabled.h	Bump year	2014-01-03 11:08:10 +08:00
win95nt.h	Bump year	2014-01-03 11:08:10 +08:00