com php-src: Merge branch 'PHP-5.6': ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h
| From: | Dmitry Stogov | Date: | Fri, 07 Nov 2014 07:24:25 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82968@lists.php.net to get a copy of this message | ||
Commit: 2afb5df4da4b27c42444a2ac9523b57c26e31459
Author: Dmitry Stogov <dmitry@zend.com> Fri, 7 Nov 2014 10:24:25 +0300
Parents: 6b4b972565e38c41f1ce43c3a475e41e186b0f0c e6581d52cc12664c2c9d470a32848c9b0bae8217
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2afb5df4da4b27c42444a2ac9523b57c26e31459
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix opcache.revalidate_freq per-request behavior
Conflicts:
ext/opcache/ZendAccelerator.h
Changed paths:
MM ext/opcache/ZendAccelerator.c
MM ext/opcache/ZendAccelerator.h
Diff:
diff --cc ext/opcache/ZendAccelerator.c
index b5d446a,42b4e91..d79e427
--- a/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 28c3d21,008e222..619ade0
--- a/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;