Changeset 57 for eaccelerator/trunk/loader.c

Timestamp:

01/06/05 05:12:26 (4 years ago)

Author:

segv74

Message:

bug fix for 1091815 ( Encoded files and php4.3.10 )
- not much tested yet.

Files:

• eaccelerator/trunk/loader.c (modified) (3 diffs)

eaccelerator/trunk/loader.c

@@ -598 +598 @@
-          case EXT_INIT_FCALL:
-          case EXT_FETCH:
-          case EXT_FE:
-          case EXT_CAST:
-          case EXT_DECLARE:
@@ -607 +606 @@
-            opline->extended_value = decode(p, l);
-            break;
+          case EXT_FE: /* EXT_FE is added at MMC_ENCODER_VERSION = 3 to support php 4.3.10 */
+#if MMC_ENCODER_VERSION >= 3
+            if (((loader_data*)MMCG(mem))->version >= 3) {
+              opline->extended_value = decode(p, l);
+            }
+#endif
+            break;
-          case EXT_OPLINE:
-            opline->extended_value = decode_opline(to->last, p, l);
@@ -617 +623 @@
-            break;
-        }
+
+#if MMC_ENCODER_VERSION >= 3 && defined(ZEND_FE_FETCH_WITH_KEY) && !defined(ZEND_ENGINE_2)
+        /* correct ZEND_FE_FETCH's extended value with old version (1,2) */
+        if (opline->opcode == ZEND_FE_FETCH) {
+          if (((loader_data*)MMCG(mem))->version < 3) {
+            opline->extended_value |= ZEND_FE_FETCH_WITH_KEY;
+          }
+        }
+#endif
-        switch (ops & RES_MASK) {
-          case RES_UNUSED: