php-src/main
Stanislav Malyshev c08f9c2c78 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
	ext/pcntl/pcntl.c
	ext/standard/basic_functions.c
	ext/standard/pack.c
	ext/standard/tests/dir/opendir_variation1-win32.phpt
2015-05-12 14:24:15 -07:00
..
streams Merge branch 'pull-request/1106' into PHP-5.5 2015-03-08 22:52:21 -07: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 2015-01-15 23:26:03 +08:00
fopen_wrappers.h Bump year 2015-01-15 23:26:03 +08:00
getopt.c Bump year 2015-01-15 23:26:03 +08:00
internal_functions_nw.c Bump year 2015-01-15 23:26:03 +08:00
internal_functions_win32.c Bump year 2015-01-15 23:26:03 +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 Fix for #66048 2015-05-12 16:12:29 +02:00
mergesort.c - MFH Cleanup exports and allow to overwrite ext registration 2008-08-22 12:59:46 +00:00
network.c Merge branch 'PHP-5.4' into PHP-5.5 2015-01-31 21:48:14 -08:00
output.c Fixed bug #65593 (Segfault when calling ob_start from output buffering callback) 2015-02-18 13:58:31 +01:00
php_compat.h Bump year 2015-01-15 23:26:03 +08:00
php_content_types.c Bump year 2015-01-15 23:26:03 +08:00
php_content_types.h Bump year 2015-01-15 23:26:03 +08:00
php_getopt.h Bump year 2015-01-15 23:26:03 +08:00
php_globals.h Bump year 2015-01-15 23:26:03 +08:00
php_ini.c Bump year 2015-01-15 23:26:03 +08:00
php_ini.h Bump year 2015-01-15 23:26:03 +08:00
php_main.h Bump year 2015-01-15 23:26:03 +08:00
php_memory_streams.h Bump year 2015-01-15 23:26:03 +08:00
php_network.h Merge branch 'PHP-5.4' into PHP-5.5 2015-01-31 21:48:14 -08:00
php_open_temporary_file.c Fix for #66048 2015-05-12 16:12:29 +02:00
php_open_temporary_file.h Bump year 2015-01-15 23:26:03 +08:00
php_output.h Bump year 2015-01-15 23:26:03 +08:00
php_reentrancy.h Bump year 2015-01-15 23:26:03 +08:00
php_scandir.c Bump year 2015-01-15 23:26:03 +08:00
php_scandir.h Bump year 2015-01-15 23:26:03 +08:00
php_sprintf.c Bump year 2015-01-15 23:26:03 +08:00
php_streams.h Bump year 2015-01-15 23:26:03 +08:00
php_syslog.h Bump year 2015-01-15 23:26:03 +08:00
php_ticks.c Bump year 2015-01-15 23:26:03 +08:00
php_ticks.h Bump year 2015-01-15 23:26:03 +08:00
php_variables.c Bump year 2015-01-15 23:26:03 +08:00
php_variables.h Bump year 2015-01-15 23:26:03 +08:00
php_version.h 5.5.26 now 2015-04-29 11:16:06 +02:00
php.h Bump year 2015-01-15 23:26:03 +08:00
reentrancy.c Bump year 2015-01-15 23:26:03 +08:00
rfc1867.c Merge branch 'PHP-5.4' into PHP-5.5 2015-05-12 14:24:15 -07:00
rfc1867.h Bump year 2015-01-15 23:26:03 +08:00
SAPI.c Merge branch 'PHP-5.4' into PHP-5.5 2015-02-05 20:09:13 -08:00
SAPI.h Bump year 2015-01-15 23:26:03 +08:00
snprintf.c Bump year 2015-01-15 23:26:03 +08:00
snprintf.h Bump year 2015-01-15 23:26:03 +08:00
spprintf.c Merge branch 'PHP-5.4' into PHP-5.5 2015-01-20 11:46:39 -08:00
spprintf.h Bump year 2015-01-15 23:26:03 +08:00
strlcat.c Bump year 2015-01-15 23:26:03 +08:00
strlcpy.c Bump year 2015-01-15 23:26:03 +08:00
win32_internal_function_disabled.h Bump year 2015-01-15 23:26:03 +08:00
win95nt.h Bump year 2015-01-15 23:26:03 +08:00