From 101853b03c45f05cd80204ecb085e8b2f0254bd6 Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Wed, 11 Jul 2007 12:56:10 +0000
Subject: [PATCH] merged 447 from 1.2, news/changelog update

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@448 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
---
 ChangeLog | 1 +
 NEWS      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 321319a..e3ed4e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Ini Settings Changes
 
 ChangeLog
 ========
+ * #55: segv php tokenizer on certain special situation
  * new: xcache.stat = On
  * could not show module info in admin page when XCache is the last module
  * wrong http auth realm
diff --git a/NEWS b/NEWS
index 6e076f7..40962d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 2.0.0 2007-?-?
 ========
+ * a rare segv bug with token_get_all
  * compatibility fix for apache 1.x, which init XCache module correctly
  * full Zend Optimizer compatibility