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 /Zend/zend_string.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 'Zend/zend_string.c')
| -rw-r--r-- | Zend/zend_string.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 7b64dd6256..612c8049ef 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -161,7 +161,6 @@ static zend_string *zend_new_interned_string_int(zend_string *str) void *old_data = HT_GET_DATA_ADDR(&CG(interned_strings)); Bucket *old_buckets = CG(interned_strings).arData; - HANDLE_BLOCK_INTERRUPTIONS(); CG(interned_strings).nTableSize += CG(interned_strings).nTableSize; CG(interned_strings).nTableMask = -CG(interned_strings).nTableSize; new_data = malloc(HT_SIZE(&CG(interned_strings))); @@ -175,12 +174,9 @@ static zend_string *zend_new_interned_string_int(zend_string *str) CG(interned_strings).nTableSize = CG(interned_strings).nTableSize >> 1; CG(interned_strings).nTableMask = -CG(interned_strings).nTableSize; } - HANDLE_UNBLOCK_INTERRUPTIONS(); } } - HANDLE_BLOCK_INTERRUPTIONS(); - idx = CG(interned_strings).nNumUsed++; CG(interned_strings).nNumOfElements++; p = CG(interned_strings).arData + idx; @@ -192,8 +188,6 @@ static zend_string *zend_new_interned_string_int(zend_string *str) Z_NEXT(p->val) = HT_HASH(&CG(interned_strings), nIndex); HT_HASH(&CG(interned_strings), nIndex) = HT_IDX_TO_HASH(idx); - HANDLE_UNBLOCK_INTERRUPTIONS(); - return str; #else return str; |