Changeset 246 for tags

Timestamp:

10/11/2006 09:03:55 AM (2 years ago)

Author:

moo

Message:

merged [211] [227] [235]

Location:

tags/1.1

Files:

• utils.c (modified) (7 diffs)
• utils.h (modified) (1 diff)
• xcache.c (modified) (2 diffs)

tags/1.1/utils.c

@@ -272 +272 @@
                 NULL
                 ) == FAILURE) {
-        CG(in_compilation) = 1;
-        CG(compiled_filename) = filename;
         CG(zend_lineno) = 0;
 #ifdef IS_UNICODE
@@ -308 +306 @@
                     NULL
                     ) == FAILURE) {
-            CG(in_compilation) = 1;
-            CG(compiled_filename) = filename;
             CG(zend_lineno) = ZESW(func->op_array.opcodes[0].lineno, func->op_array.line_start);
 #ifdef IS_UNICODE
@@ -341 +337 @@
                 ZESW(&stored_ce_ptr, NULL)
                 ) == FAILURE) {
-        CG(in_compilation) = 1;
-        CG(compiled_filename) = filename;
         CG(zend_lineno) = ZESW(0, cep->line_start);
 #ifdef IS_UNICODE
@@ -396 +390 @@
 
     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 +427 @@
     /* 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,
                 BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY(b)), b->nKeyLength TSRMLS_CC);
         b = b->pListNext;
@@ -448 +447 @@
 
     if (install) {
+        CG(in_compilation)    = 1;
+        CG(compiled_filename) = sandbox->filename;
+        CG(zend_lineno)       = 0;
         xc_sandbox_install(sandbox TSRMLS_CC);
+        CG(in_compilation)    = 0;
+        CG(compiled_filename) = NULL;
 
         /* no free as it's installed */
@@ -469 +473 @@
     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);

tags/1.1/utils.h

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

tags/1.1/xcache.c

@@ -985 +985 @@
 
 restore:
-    if (php_check_open_basedir(stored_xce->name.str.val TSRMLS_CC) != 0) {
-        return NULL;
-    }
-
+    CG(in_compilation)    = 1;
+    CG(compiled_filename) = stored_xce->name.str.val;
+    CG(zend_lineno)       = 0;
 #ifdef DEBUG
     fprintf(stderr, "restoring\n");
@@ -1016 +1015 @@
         zend_bailout();
     }
+    CG(in_compilation)    = 0;
+    CG(compiled_filename) = NULL;
 #ifdef DEBUG
     fprintf(stderr, "restored\n");