]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Fri, 21 Jun 2013 12:11:33 +0000 (14:11 +0200)
committerRemi Collet <remi@php.net>
Fri, 21 Jun 2013 12:11:33 +0000 (14:11 +0200)
commit20dbd2710835bf03a0f8e344e9bd1bbad38e845d
treefde065abe217e15a244fb89b17c0e9e900f3e0d8
parent9b22faa5b8ea2579f6247e024b0c59fd032a7eed
parentfc898ee0f94ee3686aa1f359d4a973d5e8e1754b
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed Bug #65060 imagecreatefrom... crashes with user streams Fixed Bug #65084 imagecreatefromjpeg fails with URL
ext/gd/gd.c