Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Backport 7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+

diff --cc ext/opcache/ZendAccelerator.c
Simple merge

diff --cc ext/opcache/zend_persist.h
index a87774a116879bb283428e343d35a228433d71e2,fc35eac5c88dcf25d1699ca928928f196177f6a3..f1a036b880d887712a710451917d5e7c33acd5d1
--- 1/ext/opcache/zend_persist.h
--- 2/ext/opcache/zend_persist.h
+++ b/ext/opcache/zend_persist.h
@@@ -23,7 -23,7 +23,7 @@@
  #define ZEND_PERSIST_H
  
  int zend_accel_script_persistable(zend_persistent_script *script);
- uint32_t zend_accel_script_persist_calc(zend_persistent_script *script, char *key, unsigned int key_length);
 -uint zend_accel_script_persist_calc(zend_persistent_script *script, char *key, unsigned int key_length, int for_shm);
++uint32_t zend_accel_script_persist_calc(zend_persistent_script *script, char *key, unsigned int key_length, int for_shm);
  zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, char **key, unsigned int key_length);
  
  #endif /* ZEND_PERSIST_H */

diff --cc ext/opcache/zend_persist_calc.c
index cb7eb11b7ad68ac7d9c83db0e9fe51799e76b7ad,e6726b82ed0d7bc742b0ae208d63319ac5ae69d7..232a26d12ae984f38747bb9250234a6bb2744a53
--- 1/ext/opcache/zend_persist_calc.c
--- 2/ext/opcache/zend_persist_calc.c
+++ b/ext/opcache/zend_persist_calc.c
@@@ -395,7 -396,7 +395,7 @@@ static void zend_accel_persist_class_ta
        zend_hash_persist_calc(class_table, zend_persist_class_entry_calc);
  }
  
- uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, char *key, unsigned int key_length)
 -uint zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, char *key, unsigned int key_length, int for_shm)
++uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, char *key, unsigned int key_length, int for_shm)
  {
        new_persistent_script->mem = NULL;
        new_persistent_script->size = 0;