projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f37c54a ba1af29)
Merge branch 'PHP-5.3' into PHP-5.4
authorPierre Joye <pierre.php@gmail.com>
Tue, 14 May 2013 14:45:56 +0000 (16:45 +0200)
committerPierre Joye <pierre.php@gmail.com>
Tue, 14 May 2013 14:45:56 +0000 (16:45 +0200)
* PHP-5.3:
  more check for php_stream_fopen_tmpfile failure

1  2 
ext/phar/phar_object.c patch | diff1 | diff2 | blob | history
ext/phar/util.c patch | diff1 | diff2 | blob | history

diff --cc ext/phar/phar_object.c
Simple merge
diff --cc ext/phar/util.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.