Changeset 209 for trunk

Timestamp:

2006-10-02T03:09:56+02:00 (7 years ago)

Author:

moo

Message:

fixed #42, conflict between xcache sandbox and user error handler

Location:

trunk

Files:

• utils.c (modified) (3 diffs)
• utils.h (modified) (1 diff)

trunk/utils.c

@@ -397 +397 @@
     sandbox->filename = filename;
 
+#ifdef E_STRICT
+    sandbox->orig_user_error_handler_error_reporting = EG(user_error_handler_error_reporting);
+    EG(user_error_handler_error_reporting) &= ~E_STRICT;
+#endif
+
     return sandbox;
 }
@@ -428 +433 @@
     /* install class */
     while (b != NULL) {
-        xc_install_class(sandbox->filename, (xc_cest_t*)b->pData,
+        xc_install_class(sandbox->filename, (xc_cest_t*) b->pData, -1,
                 BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength TSRMLS_CC);
         b = b->pListNext;
@@ -469 +474 @@
     memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files)));
 
+#ifdef E_STRICT
+    EG(user_error_handler_error_reporting) = sandbox->orig_user_error_handler_error_reporting;
+#endif
+
     if (sandbox->alloc) {
         efree(sandbox);

trunk/utils.h

@@ -35 +35 @@
 typedef struct {
     int alloc;
+    int orig_user_error_handler_error_reporting;
     char *filename;