Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix opcache.revalidate_freq per-request behavior

Conflicts:
	ext/opcache/ZendAccelerator.h

diff --cc ext/opcache/ZendAccelerator.c
index b5d446a54b390d6242ebe389091a22703cdfb58c,42b4e913b7fd6bf7ea9848738eca8bc1fa46de14..d79e42740d2dc7180126adc1599184d38dab32c8
--- 1/ext/opcache/ZendAccelerator.c
--- 2/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -2346,13 -2628,10 +2339,9 @@@ static int accel_startup(zend_extensio
         * include_once/require_once statements */
        accelerator_orig_zend_resolve_path = zend_resolve_path;
        zend_resolve_path = persistent_zend_resolve_path;
 -#endif
  
-       if (ZCG(accel_directives).validate_timestamps) {
-               ZCSG(revalidate_at) = zend_accel_get_time() + ZCG(accel_directives).revalidate_freq;
-       }
- 
        /* Override chdir() function */
 -      if (zend_hash_find(CG(function_table), "chdir", sizeof("chdir"), (void**)&func) == SUCCESS &&
 +      if ((func = zend_hash_str_find_ptr(CG(function_table), "chdir", sizeof("chdir")-1)) != NULL &&
            func->type == ZEND_INTERNAL_FUNCTION) {
                orig_chdir = func->internal_function.handler;
                func->internal_function.handler = ZEND_FN(accel_chdir);

diff --cc ext/opcache/ZendAccelerator.h
index 28c3d21102a9ef1ab0d68e51461f17c94d083194,008e222e4400cc6c49e24123f85d96b247254b61..619ade025d4e802e4cb8b1265d4c43b3a0bd1cc0
--- 1/ext/opcache/ZendAccelerator.h
--- 2/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@@ -266,11 -294,11 +266,10 @@@ typedef struct _zend_accel_shared_globa
        zend_accel_restart_reason restart_reason;
        zend_bool       cache_status_before_restart;
  #ifdef ZEND_WIN32
 -    unsigned long   mem_usage;
 -    unsigned long   restart_in;
 +      LONGLONG   mem_usage;
 +      LONGLONG   restart_in;
  #endif
        zend_bool       restart_in_progress;
-     time_t          revalidate_at;
 -#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
        /* Interned Strings Support */
        char           *interned_strings_start;
        char           *interned_strings_top;