Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74663 (Segfault with opcache.memory_protect and validate_timestamp)

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

diff --cc ext/opcache/ZendAccelerator.h
index c527911926bb95dfbc0c79de09d69aae25657cdd,8f2349a010e4f0a00520c094e98a14e83e30a9f8..6faa263db233e31087226eb8aa377a32b6e9e6bd
--- 1/ext/opcache/ZendAccelerator.h
--- 2/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@@ -310,7 -331,9 +310,8 @@@ void zend_accel_schedule_restart(zend_a
  void zend_accel_schedule_restart_if_necessary(zend_accel_restart_reason reason);
  accel_time_t zend_get_file_handle_timestamp(zend_file_handle *file_handle, size_t *size);
  int  validate_timestamp_and_record(zend_persistent_script *persistent_script, zend_file_handle *file_handle);
+ int  validate_timestamp_and_record_ex(zend_persistent_script *persistent_script, zend_file_handle *file_handle);
  int  zend_accel_invalidate(const char *filename, int filename_len, zend_bool force);
 -int  zend_accel_script_optimize(zend_persistent_script *persistent_script);
  int  accelerator_shm_read_lock(void);
  void accelerator_shm_read_unlock(void);
  

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