]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 13 Apr 2014 22:40:21 +0000 (15:40 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 13 Apr 2014 22:40:21 +0000 (15:40 -0700)
commit9fb92eed83e1521f4f4c03c60ade6386a37d8a78
treeef0fc9357cc4828e4347cb45c7bfe11ca4b7f46b
parent12844292b872f73c6bdec13d7832f04932662567
parent1be29a404aaba3a473d9cb7fa4b4c4cf63f6acee
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
sapi/apache2handler/sapi_apache2.c