com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c
| From: | Dmitry Stogov | Date: | Mon, 10 Jun 2013 07:25:41 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72341@lists.php.net to get a copy of this message | ||
Commit: 456ef2ebfa6d3765856bbe04dfeb953c352fe1e5
Author: Dmitry Stogov <dmitry@zend.com> Mon, 10 Jun 2013 11:25:41 +0400
Parents: 841e1f036456abc03e47f5733bf854d8e42a6a8d 540488bf55746a36363c56462e939a56550e3717
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=456ef2ebfa6d3765856bbe04dfeb953c352fe1e5
Log:
Merge branch 'PHP-5.5'
* PHP-5.5:
Compact HashTables before storing them in shared memory
Conflicts:
ext/opcache/ZendAccelerator..c
Changed paths:
MM ext/opcache/ZendAccelerator.c
Diff:
diff --cc ext/opcache/ZendAccelerator.c
index 9a6c763,212e1e6..4fa28d5
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -1126,10 -1126,10 +1126,14 @@@ static zend_persistent_script *cache_sc
return new_persistent_script;
}
+ if (!zend_accel_script_optimize(new_persistent_script TSRMLS_CC)) {
+ return new_persistent_script;
+ }
+
+ if (!compact_persistent_script(new_persistent_script)) {
+ return new_persistent_script;
+ }
+
/* exclusive lock */
zend_shared_alloc_lock(TSRMLS_C);