Changeset 224

Timestamp:

06/30/06 16:01:39 (2 years ago)

Author:

bart

Message:

Cleaned up the checking for other incompatible extensions a

bit. This should fix the use of IonCube? with eAccelerator. I did
some test loading IonCube? in different ways and never got in to
trouble. This fixes ticket #66.

Files:

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

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-06-30  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * Cleaned up the checking for other incompatible extensions a 
+          bit. This should fix the use of IonCube with eAccelerator. I did 
+          some test loading IonCube in different ways and never got in to 
+          trouble. This fixes ticket #66.
+
-2006-06-30  Hans Rakers <hans at parse dot nl>
-

eaccelerator/trunk/eaccelerator.c

@@ -2475 +2475 @@
-*/
-
+
-ZEND_DLEXPORT int eaccelerator_zend_startup(zend_extension *extension) {
- eaccelerator_is_zend_extension = 1;
@@ -2516 +2517 @@
-          }
-        }
-      } else if (strcmp(ext->name, "pcntl") == 0) {
-      } else if (strcmp(ext->name, "DBG") == 0) {
-      } else if (strcmp(ext->name, "Xdebug") == 0) {
-      } else if (strcmp(ext->name, "Advanced PHP Debugger (APD)") == 0) {
-      } else if (strcmp(ext->name, "Zend Extension Manager") == 0 ||
-                 strcmp(ext->name, "Zend Optimizer") == 0) {
@@ -2525 +2522 @@
-        ZendOptimizer = ext;
-        ext->op_array_handler = NULL;
-/*???
-        } else if (strcmp(ext->name, "the ionCube PHP Loader") == 0) {
-          zend_extension* last_ext = (zend_extension*)zend_extensions.tail->data;
-          if (ext != last_ext) {
-            last_ext->startup  = last_startup;
-            last_startup = ext->startup;
-            ext->startup = eaccelerator_ioncube_startup;
-          }
-*/
-      } else {
-        zend_error(E_CORE_ERROR,"[%s] %s %s is incompatible with %s %s",
-                   EACCELERATOR_EXTENSION_NAME,
-                   EACCELERATOR_EXTENSION_NAME,
-                   EACCELERATOR_VERSION,
-                   ext->name,
-                   ext->version);
-        exit(1);
-      }
-      p = p->next;