Changeset 496 for trunk/xcache.c

Timestamp:

2008-01-04T12:38:57+01:00 (5 years ago)

Author:

moo

Message:

fixed #157: support user error handler for E_STRICT. E_STRICT is now cached

File:

• trunk/xcache.c (modified) (2 diffs)

trunk/xcache.c

@@ -664 +664 @@
         zend_u_is_auto_global(aginfo->type, aginfo->key, aginfo->key_len TSRMLS_CC);
     }
+#endif
+#ifdef E_STRICT
+    /* restore trigger errors */
+    for (i = 0; i < p->compilererror_cnt; i ++) {
+        xc_compilererror_t *error = &p->compilererrors[i];
+        CG(zend_lineno) = error->lineno;
+        zend_error(error->type, "%s", error->error);
+    }
+    CG(zend_lineno) = 0;
 #endif
 
@@ -1115 +1124 @@
     }
     /* }}} */
+#ifdef E_STRICT
+    php->compilererrors = ((xc_sandbox_t *) XG(sandbox))->compilererrors;
+    php->compilererror_cnt = ((xc_sandbox_t *) XG(sandbox))->compilererror_cnt;
+#endif
     /* {{{ find inherited classes that should be early-binding */
     php->have_early_binding = 0;