Browse Source

fix bad merge

git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.3@634 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
1.3
Xuefer 12 years ago
parent
commit
48471ef115
  1. 46
      utils.c
  2. 7
      xcache.c

46
utils.c

@ -527,52 +527,6 @@ ZESW(xc_cest_t *, void) xc_install_class(char *filename, xc_cest_t *cest, int op
#define TG(x) (sandbox->tmp_##x)
#define OG(x) (sandbox->orig_##x)
/* }}} */
<<<<<<< .working
=======
#ifdef E_STRICT
static void xc_sandbox_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) /* {{{ */
{
xc_compilererror_t *compilererror;
xc_sandbox_t *sandbox;
TSRMLS_FETCH();
sandbox = (xc_sandbox_t *) XG(sandbox);
assert(sandbox != NULL);
if (type != E_STRICT) {
/* give up, and user handler is not supported in this case */
zend_uint i;
zend_uint orig_lineno = CG(zend_lineno);
zend_error_cb = sandbox->orig_zend_error_cb;
for (i = 0; i < sandbox->compilererror_cnt; i ++) {
compilererror = &sandbox->compilererrors[i];
CG(zend_lineno) = compilererror->lineno;
zend_error(E_STRICT, "%s", compilererror->error);
}
CG(zend_lineno) = orig_lineno;
sandbox->compilererror_cnt = 0;
sandbox->orig_zend_error_cb(type, error_filename, error_lineno, format, args);
return;
}
if (sandbox->compilererror_cnt <= sandbox->compilererror_size) {
if (sandbox->compilererror_size) {
sandbox->compilererror_size += 16;
sandbox->compilererrors = erealloc(sandbox->compilererrors, sandbox->compilererror_size * sizeof(sandbox->compilererrors));
}
else {
sandbox->compilererror_size = 16;
sandbox->compilererrors = emalloc(sandbox->compilererror_size * sizeof(sandbox->compilererrors));
}
}
compilererror = &sandbox->compilererrors[sandbox->compilererror_cnt++];
compilererror->lineno = error_lineno;
compilererror->error_len = vspprintf(&compilererror->error, 0, format, args);
}
/* }}} */
#endif
>>>>>>> .merge-right.r559
#ifdef ZEND_ENGINE_2_1
static zend_bool xc_auto_global_callback(char *name, uint name_len TSRMLS_DC) /* {{{ */
{

7
xcache.c

@ -894,11 +894,6 @@ stat_done:
return SUCCESS;
}
/* }}} */
static inline xc_hash_value_t xc_php_hash_md5(xc_entry_data_php_t *php TSRMLS_DC) /* {{{ */
{
return HASH_STR_S(php->md5, sizeof(php->md5));
}
/* }}} */
#ifndef ZEND_COMPILE_DELAYED_BINDING
static void xc_cache_early_binding_class_cb(zend_op *opline, int oplineno, void *data TSRMLS_DC) /* {{{ */
{
@ -998,7 +993,7 @@ static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /
if (stored_xce) {
TRACE("found %s, catch it", stored_xce->name.str.val);
xc_entry_hold_php_dmz(stored_xce TSRMLS_CC);
xc_cache_hit_dmz(cache);
xc_cache_hit_dmz(cache TSRMLS_CC);
break;
}

Loading…
Cancel
Save