diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-07-23 18:40:54 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-07-23 18:40:54 +0200 |
| commit | de3f60d5362629de810d640400aba0d4e37de1f0 (patch) | |
| tree | f85d6cf530bf43b21fccd14ed2913d891b0689f6 /sapi/phpdbg/phpdbg_lexer.c | |
| parent | 084a6e43cd78546168133c066c236fc82c110a43 (diff) | |
| parent | 35e717e12ef5be57f4a013208f5b25b617b3de02 (diff) | |
| download | php-git-de3f60d5362629de810d640400aba0d4e37de1f0.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #70052: getimagesize() fails for very large and very small WBMP
Conflicts:
ext/standard/image.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_lexer.c')
0 files changed, 0 insertions, 0 deletions