Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  oops, 5.4 and 5.5 use malloc in TSRM

diff --cc ext/bz2/bz2.c
index 93bcaccec86d3662ab04ee866d5812d9426224da,84fcc002aadcf38cdf8ef0c2b547c7cdfb37add0..f310289d73ecaae1b26455d2ed71a5ad4bb10327
--- 1/ext/bz2/bz2.c
--- 2/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@@ -231,7 -230,7 +231,7 @@@ PHP_BZ2_API php_stream *_php_stream_bz2
  
        if (php_check_open_basedir(path_copy TSRMLS_CC)) {
  #ifdef VIRTUAL_DIR
-         efree(path_copy);
 -              free(path_copy);
++              efree(path_copy);
  #endif
                return NULL;
        }
@@@ -243,7 -242,7 +243,7 @@@
                *opened_path = estrdup(path_copy);
        }
  #ifdef VIRTUAL_DIR
-     efree(path_copy);
 -      free(path_copy);
++      efree(path_copy);
  #endif
        path_copy = NULL;