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

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

diff --cc ext/opcache/ZendAccelerator.h
index 487010ba27ad15620aac0dce500927dd621cf6b5,dbda3b3822c0ab7ca468e28bf40070fdaaab97ce..bd197fb4012ba0e8428a942d61dc67fd1d3b2c95
--- 1/ext/opcache/ZendAccelerator.h
--- 2/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);
  

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