From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 28 Dec 2017 11:08:38 +0000 (+0300)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.2RC1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9188f1d861a829316ee6c867655cf8a360250e8b;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75720 (File cache not populated after SHM runs full)
---

9188f1d861a829316ee6c867655cf8a360250e8b
diff --cc NEWS
index a330bbaf82,5a69457c80..fbbbeae4fa
--- a/NEWS
+++ b/NEWS
@@@ -1,26 -1,12 +1,27 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.1.14
 +?? ??? ????, PHP 7.2.2
  
  - Core:
 +  . Fixed bug #75742 (potential memleak in internal classes's static members).
 +    (Laruence)
    . Fixed bug #75679 (Path 260 character problem). (Anatol)
 +  . Fixed bug #75614 (Some non-portable == in shell scripts). (jdolecek)
 +
 +- Opcache:
 +  . Fixed bug #75687 (var 8 (TMP) has array key type but not value type).
 +    (Nikita, Laruence)
 +  . Fixed bug #75698 (Using @ crashes php7.2-fpm). (Nikita)
 +
 +- PDO:
 +  . Fixed bug #75616 (PDO extension doesn't allow to be built shared on Darwin).
 +    (jdolecek)
 +
 +- PDO MySQL:
 +  . Fixed bug #75615 (PDO Mysql module can't be built as module). (jdolecek)
  
  - Opcache:
+   . Fixed bug #75720 (File cache not populated after SHM runs full). (Dmitry)
    . Fixed bug #75579 (Interned strings buffer overflow may cause crash).
      (Dmitry)
  
diff --cc ext/opcache/ZendAccelerator.c
index d9d5940574,b4033fb053..be9d162a6c
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -1251,19 -1214,10 +1251,10 @@@ static void zend_accel_add_key(char *ke
  }
  
  #ifdef HAVE_OPCACHE_FILE_CACHE
- static zend_persistent_script *cache_script_in_file_cache(zend_persistent_script *new_persistent_script, int *from_shared_memory)
+ static zend_persistent_script *store_script_in_file_cache(zend_persistent_script *new_persistent_script)
  {
 -	uint memory_used;
 +	uint32_t memory_used;
  
- 	/* Check if script may be stored in shared memory */
- 	if (!zend_accel_script_persistable(new_persistent_script)) {
- 		return new_persistent_script;
- 	}
- 
- 	if (!zend_optimize_script(&new_persistent_script->script, ZCG(accel_directives).optimization_level, ZCG(accel_directives).opt_debug_level)) {
- 		return new_persistent_script;
- 	}
- 
  	zend_shared_alloc_init_xlat_table();
  
  	/* Calculate the required memory size */