Browse Source

branch 3.1

git-svn-id: svn://svn.lighttpd.net/xcache/branches/3.1@1436 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.1
Xuefer 8 years ago
parent
commit
ae93a37b95
  1. 6
      ChangeLog
  2. 3
      NEWS
  3. 8
      xcache.c
  4. 2
      xcache/xc_sandbox.c

6
ChangeLog

@ -1,3 +1,9 @@
3.1.1 2013-??-??
ChangeLog
========
* cacher
* compatible with bcompiler
3.1.0 2013-10-10
ChangeLog
========

3
NEWS

@ -1,3 +1,6 @@
3.1.1 2013-??-??
* compatible with bcompiler
3.1.0 2013-10-10
========
* adds support for PHP_5_5

8
xcache.c

@ -728,12 +728,9 @@ static int xc_zend_startup(zend_extension *extension) /* {{{ */
ext = (zend_extension *) zend_extensions.head->data;
if (strcmp(ext->name, XCACHE_NAME) != 0) {
zend_error(E_WARNING, "XCache failed to load itself to before \"%s\". compatibility downgraded", ext->name);
zend_error(E_WARNING, "XCache failed to load itself to before zend_extension=\"%s\". compatibility downgraded", ext->name);
}
old_compile_file = zend_compile_file;
zend_compile_file = xc_check_initial_compile_file;
for (ext = (zend_extension *) zend_llist_get_first_ex(&zend_extensions, &lpos);
ext;
ext = (zend_extension *) zend_llist_get_next_ex(&zend_extensions, &lpos)) {
@ -820,6 +817,9 @@ static PHP_MINIT_FUNCTION(xcache) /* {{{ */
/* must be the first */
xcache_zend_extension_add(&xc_zend_extension_entry, 1);
old_compile_file = zend_compile_file;
zend_compile_file = xc_check_initial_compile_file;
#ifdef HAVE_XCACHE_OPTIMIZER
xc_optimizer_startup_module();
#endif

2
xcache/xc_sandbox.c

@ -163,6 +163,7 @@ static xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, ZEND_24(NOTHING, con
OG(function_table) = CG(function_table);
CG(function_table) = &TG(function_table);
EG(function_table) = CG(function_table);
OG(class_table) = CG(class_table);
CG(class_table) = &TG(class_table);
@ -331,6 +332,7 @@ static void xc_sandbox_free(xc_sandbox_t *sandbox, zend_op_array *op_array TSRML
EG(zend_constants) = OG(zend_constants);
#endif
CG(function_table) = OG(function_table);
EG(function_table) = CG(function_table);
CG(class_table) = OG(class_table);
EG(class_table) = CG(class_table);
#ifdef ZEND_ENGINE_2_1

Loading…
Cancel
Save