From: Stanislav Malyshev <stas@php.net>
Date: Thu, 8 May 2014 09:02:42 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~295^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3f09eb323986fa8e8c4c6e398071eedc6add02e;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

a3f09eb323986fa8e8c4c6e398071eedc6add02e
diff --cc ext/bz2/bz2.c
index 93bcaccec8,84fcc002aa..f310289d73
--- a/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;