Changeset 562

Timestamp:

08/17/2008 10:52:42 AM (4 months ago)

Author:

moo

Message:

5.3 support, merge news from 1.2

Location:

trunk

Files:

• ChangeLog (modified) (2 diffs)
• NEWS (modified) (1 diff)
• const_string.c (modified) (1 diff)
• const_string_opcodes_php5.1.h (modified) (4 diffs)
• const_string_opcodes_php5.3.h (deleted)
• const_string_opcodes_php6.x.h (modified) (3 diffs)
• prepare.devel (modified) (2 diffs)
• processor/processor.m4 (modified) (1 diff)
• xcache.h (modified) (1 diff)

trunk/ChangeLog

@@ -6 +6 @@
 ChangeLog
 ========
+ * fixed #102: segv when var cacher is too small
+ * fixed #55: segv php tokenizer on certain special situation
  * compiler errors: all compiler warning (E_STRICT only currently) is now cached and is supported for user handler
+ * could not show module info in admin page when XCache is the last module
+ * wrong http auth realm
+
+1.3.0 2008-?-?
+== ChangeLog ==
+ * PHP 5.3 support
+
+1.2.2 2007-12-29
+== ChangeLog ==
  * added module dependency
  * live with wrong system time: allow caching files with mtime in further
  * bug fix for compatibility with Zend Optimizer and other non-cachable
- * new: xcache.stat = On
- * could not show module info in admin page when XCache is the last module
- * wrong http auth realm
+ * #59: Maximum execution time of 60 seconds exceeded
+ * #102: segv when var cacher is too small
+ * #55: segv php tokenizer on certain special situation
+
+1.2.1 2007-07-01
+== Ini Settings Changes ==
+ * new: xcache.admin.enable_auth = On
+
+== ChangeLog ==
  * #86: remove/edit variable in admin page
- * fixed #102: segv when var cacher is too small
- * fixed #55: segv php tokenizer on certain special situation
  * fixed #109: fast inc/dec was trying to break ro protection
  * fixed #101, #105: Fixed compatibility issue for apache 1.x
@@ -21 +36 @@
  * fixed #92: Zend Optimizer compatibility issue
  * fixed #77: hits/misses was not updated
+ * fixed #59: pass by reference for internal function was broken
  * fixed #56: xcache_set segfaults when xcache.var_size=0
 

trunk/NEWS

@@ -1 +1 @@
 2.0.0 2007-?-?
+== ChangeLog ==
+
+1.3.0 2008-?-?
+== ChangeLog ==
+ * PHP 5.3 support
+
+1.2.2 2007-12-29
 ========
+ * live with wrong system time: allow caching files with mtime in further
  * bug fix for compatibility with Zend Optimizer and other non-cachable
  * a rare segv bug with token_get_all
+ * minor bug fixes
+
+1.2.1 2007-07-01
+========
  * compatibility fix for apache 1.x, which init XCache module correctly
  * full Zend Optimizer compatibility
+ * ini settings changed
+ * other bug fixes
 
 1.2.0 2006-12-10

trunk/const_string.c

@@ -64 +64 @@
 #if PHP_MAJOR_VERSION >= 6
 #   include "const_string_opcodes_php6.x.h"
-#elif defined(ZEND_ENGINE_2_3)
-#   include "const_string_opcodes_php5.3.h"
 #elif defined(ZEND_ENGINE_2_1)
 #   include "const_string_opcodes_php5.1.h"

trunk/const_string_opcodes_php5.1.h

@@ -1 @@
-/* size = 150 */
+/* size = 153 */
 static const char *const xc_opcode_names[] = {
 /* 0 */ "NOP",
@@ -70 +70 @@
 /* 67 */    "SEND_REF",
 /* 68 */    "NEW",
-/* 69 */    "UNDEF",
+/* 69 */    "INIT_NS_FCALL_BY_NAME",
 /* 70 */    "FREE",
 /* 71 */    "INIT_ARRAY",
@@ -101 +101 @@
 /* 98 */    "FETCH_DIM_TMP_VAR",
 /* 99 */    "FETCH_CONSTANT",
-/* 100 */   "UNDEF",
+/* 100 */   "GOTO",
 /* 101 */   "EXT_STMT",
 /* 102 */   "EXT_FCALL_BEGIN",
@@ -144 +144 @@
 /* 141 */   "DECLARE_FUNCTION",
 /* 142 */   "RAISE_ABSTRACT_ERROR",
-/* 143 */   "UNDEF",
+/* 143 */   "DECLARE_CONST",
 /* 144 */   "ADD_INTERFACE",
-/* 145 */   "UNDEF",
+/* 145 */   "DECLARE_INHERITED_CLASS_DELAYED",
 /* 146 */   "VERIFY_ABSTRACT_CLASS",
 /* 147 */   "ASSIGN_DIM",
 /* 148 */   "ISSET_ISEMPTY_PROP_OBJ",
 /* 149 */   "HANDLE_EXCEPTION",
-/* 150 */   "USER_OPCODE"
+/* 150 */   "USER_OPCODE",
+/* 151 */   "UNDEF",
+/* 152 */   "JMP_SET",
+/* 153 */   "DECLARE_LAMBDA_FUNCTION"
 };

trunk/const_string_opcodes_php6.x.h

@@ -1 @@
-/* size = 152 */
+/* size = 153 */
 static const char *const xc_opcode_names[] = {
 /* 0 */ "NOP",
@@ -146 +146 @@
 /* 143 */   "DECLARE_CONST",
 /* 144 */   "ADD_INTERFACE",
-/* 145 */   "UNDEF",
+/* 145 */   "DECLARE_INHERITED_CLASS_DELAYED",
 /* 146 */   "VERIFY_ABSTRACT_CLASS",
 /* 147 */   "ASSIGN_DIM",
@@ -153 +153 @@
 /* 150 */   "USER_OPCODE",
 /* 151 */   "U_NORMALIZE",
-/* 152 */   "JMP_SET"
+/* 152 */   "JMP_SET",
+/* 153 */   "DECLARE_LAMBDA_FUNCTION"
 };

trunk/prepare.devel

@@ -28 +28 @@
     make_const_string_opcodes_php5.0.h
     make_const_string_opcodes_php5.1.h
-    make_const_string_opcodes_php5.3.h
     make_const_string_opcodes_php6.x.h
 }
@@ -47 +46 @@
 make_const_string_opcodes_php5.1.h() {
     precheck const_string_opcodes_php5.1.h "${PHP5_1_DIR}/Zend/zend_vm_def.h"  && "$AWK" -f ./mkopcode.awk < "$I" > "$O.tmp" && mv "$O.tmp" "$O"
-}
-
-make_const_string_opcodes_php5.3.h() {
-    precheck const_string_opcodes_php5.3.h "${PHP5_3_DIR}/Zend/zend_vm_def.h"  && "$AWK" -f ./mkopcode.awk < "$I" > "$O.tmp" && mv "$O.tmp" "$O"
 }
 

trunk/processor/processor.m4

@@ -618 +618 @@
     COPY(start_op)
     DISPATCH(int, backpatch_count)
+#ifdef ZEND_ENGINE_2_3
+    DISPATCH(zend_uint, this_var)
+#endif
 
     DISPATCH(zend_bool, done_pass_two)
-#ifdef ZEND_ENGINE_2
+    /* 5.0 <= ver < 5.3 */
+#if defined(ZEND_ENGINE_2) && !defined(ZEND_ENGINE_2_3)
     DISPATCH(zend_bool, uses_this)
 #endif

trunk/xcache.h

@@ -52 +52 @@
 #endif
 #ifndef Z_SET_ISREF
-#   define Z_SET_ISREF(z) (z).is_ref = 1;
+#   define Z_SET_ISREF(z) (z).is_ref = 1
 #endif
 #ifndef Z_UNSET_ISREF
-#   define Z_UNSET_ISREF(z) (z).is_ref = 0;
+#   define Z_UNSET_ISREF(z) (z).is_ref = 0
 #endif
 #ifndef Z_SET_REFCOUNT
-#   define Z_SET_REFCOUNT(z, rc) (z).refcount = rc;
+#   define Z_SET_REFCOUNT(z, rc) (z).refcount = rc
 #endif
 #ifndef IS_CONSTANT_TYPE_MASK