From 35a0b57dcdd1767c946bbcc27b7137611727482a Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Mon, 17 Dec 2012 13:32:47 +0000
Subject: [PATCH] undefined variable when ini is not found

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1202 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
---
 ChangeLog                  | 3 ++-
 NEWS                       | 2 +-
 htdocs/diagnosis/index.php | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8797492..5cc7824 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,8 @@ ChangeLog
  * fixes #290: workaround phpize vs fbsd make bug again
  * improve compatibility with "the ionCube PHP Loader", Zend Optimizer
  * fix random crash when cache is reinitialized yet failed (Thanks to Brad Baker for generating crash dump)
- * fix ZTS thead safe
+ * fix locking impl: improve stability on threaded env
+ * diagnosis: undefined variable when ini is not found
 
 3.0.0 2012-10-29
 API Changes
diff --git a/NEWS b/NEWS
index 54a93bd..577e36f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@
 ChangeLog
 ========
  * bug fixes
- * fix ZTS thead safe
+ * improve stability on threaded env
  * improve compatibility with "the ionCube PHP Loader", Zend Optimizer
  * improve stability
 
diff --git a/htdocs/diagnosis/index.php b/htdocs/diagnosis/index.php
index a4b514c..c769674 100644
--- a/htdocs/diagnosis/index.php
+++ b/htdocs/diagnosis/index.php
@@ -80,7 +80,7 @@ if (!$xcacheLoaded) {
 	if ($loadedIni) {
 		echo sprintf(_T("Add extension=xcache.so (or xcache.dll) in %s"), $loadedIni);
 	}
-	else if (preg_match('!Configuration File \\(php.ini\\) Path *</td><td class="v">([^<]+)!', $info, $m)) {
+	else if (preg_match('!Configuration File \\(php.ini\\) Path *</td><td class="v">([^<]+)!', $loadedIni, $m)) {
 		echo sprintf(_T("Please put a php.ini in %s and add extension=xcache.so (or xcache.dll) in it"), $iniDirectory);
 	}
 	else {