]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 12 May 2015 21:24:15 +0000 (14:24 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 12 May 2015 21:24:15 +0000 (14:24 -0700)
commitc08f9c2c786b0f7cbb401c18f6634cb5773f5baf
tree5092cb2f0c1fa69076b0bcc8f2bc8a46308514c4
parentc117548ea9365adac00960fe5f43425b2955310d
parentf473ea5464361848f6fc45a8456c78de6d9f53c6
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
Zend/zend_alloc.c
Zend/zend_operators.c
ext/ftp/ftp.c
ext/pcntl/pcntl.c
ext/phar/tar.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