Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure

diff --cc ext/mysql/php_mysql.c
Simple merge

diff --cc ext/phar/phar_object.c
Simple merge