Merge branch 'PHP-5.6'

Conflicts:
	ext/phar/phar_object.c

diff --cc ext/phar/phar_object.c
index f58d125cf2341b461d75eba699961a3dccc6d104,e9a64f39c9389f96d281d88228fc81cc5512fcd1..0b173d1e0bb829c8da2ee4360f368228c55ff829
--- 1/ext/phar/phar_object.c
--- 2/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@@ -2115,8 -2141,8 +2115,8 @@@ static zend_object *phar_rename_archive
        }
  its_ok:
        if (SUCCESS == php_stream_stat_path(newpath, &ssb)) {
-               efree(oldpath);
 -              zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "phar \"%s\" exists and must be unlinked prior to conversion", newpath);
 +              zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "phar \"%s\" exists and must be unlinked prior to conversion", newpath);
+               efree(oldpath);
                return NULL;
        }
        if (!phar->is_data) {