Changeset 406

Timestamp:

02/18/10 14:49:23 (5 months ago)

Author:

hans

Message:

php_check_open_basedir only needs to be called when restoring

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.c (modified) (2 diffs)

eaccelerator/trunk/ChangeLog

@@ -3 +3 @@
-                * Remove some leftover debug output that broke compilation with
-                  php-5.2 and --with-eaccelerator-debug
+                * php_check_open_basedir only needs to be called when restoring
-
-2010-02-04      Hans Rakers <hans at react.nl>

eaccelerator/trunk/eaccelerator.c

@@ -777 +777 @@
-  EACCELERATOR_PROTECT();
-  if (p != NULL && p->op_array != NULL) {
+    /* only restore file when open_basedir allows it */
+    if (php_check_open_basedir(realname TSRMLS_CC)) {
+      return NULL;
+    }
-    EAG(class_entry) = NULL;
-    op_array = restore_op_array(NULL, p->op_array TSRMLS_CC);
@@ -1129 +1133 @@
-    DBG(ea_debug_printf, (EA_DEBUG, "[%d] Leave COMPILE\n", getpid()));
-    return t;
-  }
-
-  /* only restore file when open_basedir allows it */
-  if (PG(open_basedir) && php_check_open_basedir(realname TSRMLS_CC)) {
-    zend_error(E_ERROR, "Can't load %s, open_basedir restriction.", file_handle->filename);
-  }
-