Merge branch 'PHP-5.6'

Conflicts:
	Zend/zend_exceptions.c

diff --cc ext/phar/phar.c
index a28a5ea6d7b695c3bfa9dfcb73a93e87110cd4b0,a861a034647a6e80ebad0851e018adee293647fb..32f641624a75db7c561b23c0c67b803a304140fe
--- 1/ext/phar/phar.c
--- 2/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@@ -609,12 -606,14 +609,13 @@@ int phar_parse_metadata(char **buffer, 
        php_unserialize_data_t var_hash;
  
        if (zip_metadata_len) {
-               const unsigned char *p, *p_buff = estrndup(*buffer, zip_metadata_len);
+               const unsigned char *p;
+               unsigned char *p_buff = (unsigned char *)estrndup(*buffer, zip_metadata_len);
                p = p_buff;
 -              ALLOC_ZVAL(*metadata);
 -              INIT_ZVAL(**metadata);
 +              ZVAL_NULL(metadata);
                PHP_VAR_UNSERIALIZE_INIT(var_hash);
  
 -              if (!php_var_unserialize(metadata, &p, p + zip_metadata_len, &var_hash TSRMLS_CC)) {
 +              if (!php_var_unserialize(metadata, &p, p + zip_metadata_len, &var_hash)) {
                        efree(p_buff);
                        PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
                        zval_ptr_dtor(metadata);