branch 1.3

git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.3@494 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

ChangeLog

@@ -1,7 +1,9 @@
-1.2.2 2007-?-?
+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
+ * #59: Maximum execution time of 60 seconds exceeded
  * #102: segv when var cacher is too small
  * #55: segv php tokenizer on certain special situation
 

NEWS

@@ -1,7 +1,9 @@
-1.2.2 2007-?-?
+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
 ========

xcache.c

@@ -2760,10 +2760,27 @@ static ZEND_MODULE_POST_ZEND_DEACTIVATE_D(xcache)
 	return SUCCESS;
 }
 /* }}} */
+/* {{{ module dependencies */
+#if ZEND_MODULE_API_NO >= 20050922
+static const zend_module_dep xcache_module_deps[] = {
+	ZEND_MOD_REQUIRED("standard")
+	ZEND_MOD_CONFLICTS("apc")
+	ZEND_MOD_CONFLICTS("eAccelerator")
+	ZEND_MOD_CONFLICTS("Turck MMCache")
+	{NULL, NULL, NULL}
+};
+#endif
+/* }}} */ 
 /* {{{ module definition structure */
 
 zend_module_entry xcache_module_entry = {
+#if ZEND_MODULE_API_NO >= 20050922
+	STANDARD_MODULE_HEADER_EX,
+	NULL,
+	xcache_module_deps,
+#else
 	STANDARD_MODULE_HEADER,
+#endif
 	XCACHE_NAME,
 	xcache_functions,
 	PHP_MINIT(xcache),

xcache.h

@@ -1,7 +1,7 @@
 #ifndef __XCACHE_H
 #define __XCACHE_H
 #define XCACHE_NAME       "XCache"
-#define XCACHE_VERSION    "1.2.2-dev"
+#define XCACHE_VERSION    "1.3.0-dev"
 #define XCACHE_AUTHOR     "mOo"
 #define XCACHE_COPYRIGHT  "Copyright (c) 2005-2007"
 #define XCACHE_URL        "http://xcache.lighttpd.net"