com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_accelerator_module.c
| From: | Dmitry Stogov | Date: | Mon, 23 Dec 2013 08:50:42 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_accelerator_module.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75407@lists.php.net to get a copy of this message | ||
Commit: f5c200fce984e5f16677c7fa25a755f10a47eb07
Author: Dmitry Stogov <dmitry@zend.com> Mon, 23 Dec 2013 12:50:42 +0400
Parents: ee55edf5e41b695f781d36a808664e42d6a3dcd0 0dcaf0f445a4084f3dbb37411b6acead4658c5f5
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f5c200fce984e5f16677c7fa25a755f10a47eb07
Log:
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
Bugs:
https://bugs.php.net/140
Changed paths:
MM ext/opcache/ZendAccelerator.c
MM ext/opcache/ZendAccelerator.h
MM ext/opcache/zend_accelerator_module.c
Diff:
diff --cc ext/opcache/ZendAccelerator.h
index 487010b,dbda3b3..bd197fb
--- 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);