]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 084a6e4 35e717e)
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Thu, 23 Jul 2015 16:40:54 +0000 (18:40 +0200)
committerChristoph M. Becker <cmb@php.net>
Thu, 23 Jul 2015 16:40:54 +0000 (18:40 +0200)
commitde3f60d5362629de810d640400aba0d4e37de1f0
treef85d6cf530bf43b21fccd14ed2913d891b0689f6tree | snapshot
parent084a6e43cd78546168133c066c236fc82c110a43commit | diff
parent35e717e12ef5be57f4a013208f5b25b617b3de02commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #70052: getimagesize() fails for very large and very small WBMP

Conflicts:
ext/standard/image.c
ext/standard/image.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.