Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference.

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

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

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

diff --cc ext/opcache/zend_persist.h
index 51959a22ea36b44d68d8ab4dbe3cc9f3b36caa36,166c08fd139611a36527de4f2b0c3f1e1ad21e29..73f0215a6571ecd9975ce66c0fae01c951446511
--- 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);
 -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);
+ zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, char **key, unsigned int key_length, int for_shm);
  
  #endif /* ZEND_PERSIST_H */