]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Tue, 14 May 2013 14:46:32 +0000 (16:46 +0200)
committerPierre Joye <pierre.php@gmail.com>
Tue, 14 May 2013 14:46:32 +0000 (16:46 +0200)
commit42a186e22d6621dfb606fa2e562140faa08e8c99
treea3143f471a8a771336ece9c76e469698fc9269fd
parent362402d7484725287b5eae23936b09e570d83d48
parent7ec2e5314eb62d9cd2ef23e0b62445eb50cc23c0
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  more check for php_stream_fopen_tmpfile failure
ext/phar/phar_object.c