]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: adbb301 c08f9c2)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 12 May 2015 21:26:06 +0000 (14:26 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 12 May 2015 21:26:06 +0000 (14:26 -0700)
commit587ddf6ddccd707d67d48dccd4f4ca0a90224ac9
treecf67e35a6088482a23861f25fe8e01a3213bb717tree | snapshot
parentadbb301a70e16ada22f14a7e623b73d84580f12dcommit | diff
parentc08f9c2c786b0f7cbb401c18f6634cb5773f5bafcommit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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/standard/pack.c
Zend/zend_operators.c diff1 | diff2 | blob | history
ext/phar/tar.c diff1 | diff2 | blob | history
ext/standard/basic_functions.c diff1 | diff2 | blob | history
ext/standard/dir.c diff1 | diff2 | blob | history
ext/standard/file.c diff1 | diff2 | blob | history
ext/standard/pack.c diff1 | diff2 | blob | history
ext/standard/string.c diff1 | diff2 | blob | history
main/rfc1867.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.