Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for bug #69958

diff --cc ext/phar/phar_object.c
index b080e65b07781645e8301047e2d33f7a316409c8,8cfe0c82284a5c4dcbb5f2bf520760390f279a0c..46c3d7cb3497421e46010b0c1bef074e2764d47d
--- 1/ext/phar/phar_object.c
--- 2/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@@ -2127,8 -2199,8 +2127,9 @@@ static zval *phar_rename_archive(phar_a
                                (*pphar)->fp = phar->fp;
                                phar->fp = NULL;
                                phar_destroy_phar_data(phar TSRMLS_CC);
 +                              *sphar = NULL;
                                phar = *pphar;
+                               *sphar = NULL;
                                phar->refcount++;
                                newpath = oldpath;
                                goto its_ok;