Stanislav Malyshev 5a1bef8eef Merge branch 'PHP-5.6' ...

* PHP-5.6:
  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:
	Zend/zend_alloc.c
	Zend/zend_operators.c
	ext/ftp/ftp.c
	ext/pcntl/pcntl.c
	ext/standard/basic_functions.c
	ext/standard/dir.c
	ext/standard/file.c
	ext/standard/pack.c
	ext/standard/string.c
	main/rfc1867.c

2015-05-12 15:00:24 -07:00

..

chdir_basic.phpt

…

chdir_error1.phpt

…

chdir_error2.phpt

…

chdir_variation1.phpt

…

chdir_variation2.phpt

…

closedir_basic.phpt

…

closedir_error.phpt

…

closedir_variation1.phpt

…

closedir_variation2.phpt

…

closedir_variation3.phpt

…

dir_basic.phpt

…

dir_error.phpt

…

dir_variation1.phpt

…

dir_variation2.phpt

…

dir_variation3.phpt

…

dir_variation4.phpt

…

dir_variation5.phpt

…

dir_variation6.phpt

…

dir_variation7.phpt

…

dir_variation8.phpt

…

dir_variation9.phpt

…

getcwd_basic.phpt

…

getcwd_error.phpt

…

opendir_basic.phpt

…

opendir_error1.phpt

…

opendir_error2.phpt

…

opendir_variation1.phpt

…

opendir_variation2.phpt

…

opendir_variation3.phpt

…

opendir_variation4.phpt

…

opendir_variation5.phpt

…

opendir_variation6-win32.phpt

…

opendir_variation6.phpt

…

opendir_variation7.phpt

…

readdir_basic.phpt

…

readdir_error.phpt

…

readdir_variation1.phpt

…

readdir_variation2.phpt

…

readdir_variation3.phpt

…

readdir_variation4.phpt

…

readdir_variation5.phpt

…

readdir_variation6.phpt

…

readdir_variation7.phpt

…

rewinddir_basic.phpt

…

rewinddir_error.phpt

…

rewinddir_variation1.phpt

…

rewinddir_variation2.phpt

…

rewinddir_variation3.phpt

…

scandir_basic.phpt

…

scandir_error1.phpt

…

scandir_error2.phpt

…

scandir_variation1.phpt

…

scandir_variation2.phpt

…

scandir_variation3.phpt

…

scandir_variation4.phpt

…

scandir_variation5.phpt

…

scandir_variation6.phpt

…

scandir_variation7.phpt

…

scandir_variation8.phpt

…

scandir_variation9.phpt

…

scandir_variation10.phpt

…