diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-06-20 15:43:33 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-06-20 15:43:33 +0200 |
| commit | 5408d96716176e90c96ae844a35fcdfc82d2bb1c (patch) | |
| tree | 10ebf4cfe58f1395fcd1d739a46d1cce7c6e89c1 /ext/standard/array.c | |
| parent | a291d92067b4610aaf1eb96fa528c7cb316b4d60 (diff) | |
| parent | c622cc4446951044dbef419e3ad59fc90eebd3a1 (diff) | |
| download | php-git-5408d96716176e90c96ae844a35fcdfc82d2bb1c.tar.gz | |
Merge branch 'master' of http://git.php.net/repository/php-src
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 67aec057b8..40c093eff3 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2395,7 +2395,6 @@ static void php_array_data_shuffle(zval *array) /* {{{ */ } } } - HANDLE_BLOCK_INTERRUPTIONS(); hash->nNumUsed = n_elems; hash->nInternalPointer = 0; @@ -2411,7 +2410,6 @@ static void php_array_data_shuffle(zval *array) /* {{{ */ if (!(hash->u.flags & HASH_FLAG_PACKED)) { zend_hash_to_packed(hash); } - HANDLE_UNBLOCK_INTERRUPTIONS(); } /* }}} */ @@ -4994,7 +4992,6 @@ PHP_FUNCTION(array_multisort) zend_qsort(indirect, array_size, sizeof(Bucket *), php_multisort_compare, (swap_func_t)array_bucket_p_sawp); /* Restructure the arrays based on sorted indirect - this is mostly taken from zend_hash_sort() function. */ - HANDLE_BLOCK_INTERRUPTIONS(); for (i = 0; i < num_arrays; i++) { int repack; @@ -5018,7 +5015,6 @@ PHP_FUNCTION(array_multisort) zend_hash_rehash(hash); } } - HANDLE_UNBLOCK_INTERRUPTIONS(); /* Clean up. */ for (i = 0; i < array_size; i++) { |