From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 14 Jun 2019 10:29:30 +0000 (+0300)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0alpha2~97^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96a6f7f7f572875e0d18de21f5f67429d1ffe099;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Backport 96a12578c13b5c37195b10526fcdc669b795644d
---

96a6f7f7f572875e0d18de21f5f67429d1ffe099
diff --cc ext/opcache/ZendAccelerator.c
index 1bf2148e54,70508b6b05..8ba242723d
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -751,13 -655,12 +751,12 @@@ static void accel_use_shm_interned_stri
  	SHM_UNPROTECT();
  	zend_shared_alloc_lock();
  
 -	if (ZCSG(interned_strings_saved_top) == NULL) {
 +	if (ZCSG(interned_strings).saved_top == NULL) {
  		accel_copy_permanent_strings(accel_new_interned_string);
  	} else {
+ 		ZCG(counted) = 1;
  		accel_copy_permanent_strings(accel_replace_string_by_shm_permanent);
- 		if (ZCG(counted)) {
- 			accel_deactivate_sub();
- 		}
+ 		ZCG(counted) = 0;
  	}
  	accel_interned_strings_save_state();