From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 27 May 2017 14:43:23 +0000 (+0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~43^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19befb1ca2dca00fc2e281619302535c426a8033;p=php

Merge branch 'PHP-7.0' into PHP-7.1

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

19befb1ca2dca00fc2e281619302535c426a8033
diff --cc ext/opcache/ZendAccelerator.h
index c527911926,8f2349a010..6faa263db2
--- a/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);