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

..

chdir_basic.phpt

…

chdir_error1.phpt

…

chdir_error2.phpt

…

chdir_variation1.phpt

- Missing fixes for grammar fix 's/valid path/a valid path/'

2011-06-09 00:23:43 +00:00

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

Update tests

2015-05-11 00:12:39 -07:00

dir_variation2.phpt

…

dir_variation3.phpt

…

dir_variation4.phpt

…

dir_variation5.phpt

- add -win32 versions and skipif

2011-09-16 10:45:04 +00:00

dir_variation6.phpt

- add -win32 versions and skipif

2011-09-16 10:45:04 +00:00

dir_variation7.phpt

…

dir_variation8.phpt

- add -win32 versions and skipif

2011-09-16 10:45:04 +00:00

dir_variation9.phpt

- add -win32 versions and skipif

2011-09-16 10:45:04 +00:00

getcwd_basic.phpt

…

getcwd_error.phpt

…

opendir_basic.phpt

…

opendir_error1.phpt

…

opendir_error2.phpt

- add -win32 versions and skipif

2011-09-16 10:45:04 +00:00

opendir_variation1.phpt

Update tests

2015-05-11 00:12:39 -07:00

opendir_variation2.phpt

…

opendir_variation3.phpt

…

opendir_variation4.phpt

…

opendir_variation5.phpt

…

opendir_variation6-win32.phpt

- make it windows version independent, error msg differs, bad but well

2012-01-10 08:30:00 +00:00

opendir_variation6.phpt

- add -win32 versions and skipif

2011-09-16 10:45:04 +00:00

opendir_variation7.phpt

…

readdir_basic.phpt

…

readdir_error.phpt

…

readdir_variation1.phpt

…

readdir_variation2.phpt

…

readdir_variation3.phpt

…

readdir_variation4.phpt

Changed silent conversion of array to string to produce a notice. (Patrick)

2011-10-21 06:08:47 +00:00

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

- add -win32 versions and skipif

2011-09-16 10:45:04 +00:00

scandir_variation1.phpt

- add -win32 versions and skipif

2011-09-16 10:45:04 +00:00

scandir_variation2.phpt

…

scandir_variation3.phpt

…

scandir_variation4.phpt

…

scandir_variation5.phpt

…

scandir_variation6.phpt

- add -win32 versions and skipif

2011-09-16 10:45:04 +00:00

scandir_variation7.phpt

…

scandir_variation8.phpt

Changed silent conversion of array to string to produce a notice. (Patrick)

2011-10-21 06:08:47 +00:00

scandir_variation9.phpt

…

scandir_variation10.phpt

…