diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-05-12 14:24:15 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-05-12 14:24:15 -0700 |
| commit | c08f9c2c786b0f7cbb401c18f6634cb5773f5baf (patch) | |
| tree | 5092cb2f0c1fa69076b0bcc8f2bc8a46308514c4 /ext/mcrypt/php_mcrypt.h | |
| parent | c117548ea9365adac00960fe5f43425b2955310d (diff) | |
| parent | f473ea5464361848f6fc45a8456c78de6d9f53c6 (diff) | |
| download | php-git-c08f9c2c786b0f7cbb401c18f6634cb5773f5baf.tar.gz | |
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
Diffstat (limited to 'ext/mcrypt/php_mcrypt.h')
0 files changed, 0 insertions, 0 deletions