From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 23 Dec 2013 08:50:42 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5c200fce984e5f16677c7fa25a755f10a47eb07;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  opcodes
---

f5c200fce984e5f16677c7fa25a755f10a47eb07
diff --cc ext/opcache/ZendAccelerator.h
index 487010ba27,dbda3b3822..bd197fb401
--- a/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@@ -330,8 -330,8 +330,9 @@@ extern char *zps_api_failure_reason
  void accel_shutdown(TSRMLS_D);
  void zend_accel_schedule_restart(zend_accel_restart_reason reason TSRMLS_DC);
  void zend_accel_schedule_restart_if_necessary(zend_accel_restart_reason reason TSRMLS_DC);
+ int  validate_timestamp_and_record(zend_persistent_script *persistent_script, zend_file_handle *file_handle TSRMLS_DC);
  int  zend_accel_invalidate(const char *filename, int filename_len, zend_bool force TSRMLS_DC);
 +int  zend_accel_script_optimize(zend_persistent_script *persistent_script TSRMLS_DC);
  int  accelerator_shm_read_lock(TSRMLS_D);
  void accelerator_shm_read_unlock(TSRMLS_D);