From 937b95443a6e84c5069a5f48f4d67395fc60f5b2 Mon Sep 17 00:00:00 2001
From: Mikko Koppanen <mkoppanen@gameboy.local>
Date: Wed, 9 Jun 2010 11:58:40 +0100
Subject: [PATCH] Add changelog, fix test hlper filenames

---
 ChangeLog                            | 29 ++++++++++++++++++++++++++++
 package.xml                          |  9 ++++-----
 tests/001-connect.phpt               |  4 ++--
 tests/002-put-and-get.phpt           |  4 ++--
 tests/003-put-and-get-multiple.phpt  |  4 ++--
 tests/004-out.phpt                   |  4 ++--
 tests/005-clone.phpt                 |  4 ++--
 tests/006-stress-test.phpt           |  4 ++--
 tests/007-add.phpt                   |  4 ++--
 tests/008-table-put.phpt             |  4 ++--
 tests/009-search.phpt                |  4 ++--
 tests/010-stat.phpt                  |  4 ++--
 tests/011-setindex.phpt              |  4 ++--
 tests/012-table-out.phpt             |  4 ++--
 tests/013-size.phpt                  |  4 ++--
 tests/014-fwmkeys.phpt               |  4 ++--
 tests/015-num.phpt                   |  4 ++--
 tests/016-key-prefix.phpt            |  4 ++--
 tests/017-session-handler.phpt       |  4 ++--
 tests/018-metasearch.phpt            |  4 ++--
 tests/019-hint.phpt                  |  4 ++--
 tests/020-large-out.phpt             |  4 ++--
 tests/021-binarysafe.phpt            |  4 ++--
 tests/022-binarysafe-key.phpt        |  4 ++--
 tests/023-iterate-kv.phpt            |  4 ++--
 tests/024-iterate-table.phpt         |  4 ++--
 tests/025-table-multiget.phpt        |  4 ++--
 tests/{config.inc.php => config.inc} |  0
 tests/{skipif.inc.php => skipif.inc} |  0
 29 files changed, 83 insertions(+), 55 deletions(-)
 create mode 100644 ChangeLog
 rename tests/{config.inc.php => config.inc} (100%)
 rename tests/{skipif.inc.php => skipif.inc} (100%)

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..fc68145
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,29 @@
+?.?.?
+
+0.5.0
+- Fix crash when session_regenerate_id(true) is called
+- Fix SIGFPE when no servers are added to the pool
+- Make configure pkg-config checks more robust
+
+0.4.0
+- Fix restore method to use correct timestamp precision
+- Dual license under PHP and BSD licenses
+
+0.3.0  	
+- Added multiget for tables. Thanks to Devin
+- Fixed binary safety on table methods
+
+0.2.0 	
+- Warnings instead of fatal errors in session handler
+- Added TokyoTyrantIterator
+- Added getIterator method to TokyoTyrant and TokyoTyrantTable classes
+
+0.1.2 	
+- Make sure that keys and values are binary-safe
+
+0.1.1 	
+- Disabled timeout by default
+- Added tune method to change the timeout
+
+0.1.0 	
+- Initial release
diff --git a/package.xml b/package.xml
index 8a39784..830c58a 100644
--- a/package.xml
+++ b/package.xml
@@ -15,10 +15,10 @@ This extension requires Tokyo Cabinet, Tokyo Tyrant and PHP version 5.2.0+.
 		<email>mkoppanen@php.net</email>
 		<active>yes</active>
 	</lead>
-	<date>2010-03-29</date>
+	<date>2010-06-09</date>
 	<version>
-		<release>0.4.0</release>
-		<api>0.4.0</api>
+		<release>0.5.0</release>
+		<api>0.5.0</api>
 	</version>
 	<stability>
 		<release>beta</release>
@@ -26,8 +26,7 @@ This extension requires Tokyo Cabinet, Tokyo Tyrant and PHP version 5.2.0+.
 	</stability>
 	<license uri="http://www.php.net/license">PHP License</license>
 <notes>
-  - Fix restore method to use correct timestamp precision
-  - Dual license under PHP and BSD licenses
+- Fix crash when session_regenerate_id(true) is called
 </notes>
 	<contents>
 		<dir name="/">
diff --git a/tests/001-connect.phpt b/tests/001-connect.phpt
index 74804e1..384ed14 100644
--- a/tests/001-connect.phpt
+++ b/tests/001-connect.phpt
@@ -2,11 +2,11 @@
 Test connect variations
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT, array('persistent' => true));
 $tt->connect(TT_HOST, TT_PORT, array('persistent' => false));
diff --git a/tests/002-put-and-get.phpt b/tests/002-put-and-get.phpt
index 5fe14d8..2508a1a 100644
--- a/tests/002-put-and-get.phpt
+++ b/tests/002-put-and-get.phpt
@@ -2,11 +2,11 @@
 Test single value put / get variations
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 $tt->vanish();
diff --git a/tests/003-put-and-get-multiple.phpt b/tests/003-put-and-get-multiple.phpt
index 3529065..6140fc5 100644
--- a/tests/003-put-and-get-multiple.phpt
+++ b/tests/003-put-and-get-multiple.phpt
@@ -2,11 +2,11 @@
 Test multiple value put / get variations
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 $tt->vanish();
diff --git a/tests/004-out.phpt b/tests/004-out.phpt
index 5f58c97..065e698 100644
--- a/tests/004-out.phpt
+++ b/tests/004-out.phpt
@@ -2,11 +2,11 @@
 Test removing records
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 $tt->vanish();
diff --git a/tests/005-clone.phpt b/tests/005-clone.phpt
index 8f33004..d334ff6 100644
--- a/tests/005-clone.phpt
+++ b/tests/005-clone.phpt
@@ -2,11 +2,11 @@
 Test variations of clone
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 $tt2 = clone $tt;
diff --git a/tests/006-stress-test.phpt b/tests/006-stress-test.phpt
index bbb8173..898c432 100644
--- a/tests/006-stress-test.phpt
+++ b/tests/006-stress-test.phpt
@@ -2,11 +2,11 @@
 Test put, get and out in a batch
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $values = 100;
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
diff --git a/tests/007-add.phpt b/tests/007-add.phpt
index 00ea5f3..b9c3416 100644
--- a/tests/007-add.phpt
+++ b/tests/007-add.phpt
@@ -2,11 +2,11 @@
 Test add int and double
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 $tt->vanish();
diff --git a/tests/008-table-put.phpt b/tests/008-table-put.phpt
index 0895087..6ecfdc4 100644
--- a/tests/008-table-put.phpt
+++ b/tests/008-table-put.phpt
@@ -2,11 +2,11 @@
 Table put variations
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrantTable(TT_TABLE_HOST, TT_TABLE_PORT);
 $tt->vanish();
diff --git a/tests/009-search.phpt b/tests/009-search.phpt
index d2cd0ac..8a75f09 100644
--- a/tests/009-search.phpt
+++ b/tests/009-search.phpt
@@ -2,11 +2,11 @@
 Table search variations
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrantTable(TT_TABLE_HOST, TT_TABLE_PORT);
 $tt->sync()->vanish();
diff --git a/tests/010-stat.phpt b/tests/010-stat.phpt
index 08b01f6..3673431 100644
--- a/tests/010-stat.phpt
+++ b/tests/010-stat.phpt
@@ -2,11 +2,11 @@
 Make sure that stat returns an array
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 echo gettype($tt->stat());
diff --git a/tests/011-setindex.phpt b/tests/011-setindex.phpt
index 45969dc..c276f8d 100644
--- a/tests/011-setindex.phpt
+++ b/tests/011-setindex.phpt
@@ -2,11 +2,11 @@
 Test setting an index on column
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrantTable(TT_TABLE_HOST, TT_TABLE_PORT);
 $tt->vanish();
diff --git a/tests/012-table-out.phpt b/tests/012-table-out.phpt
index c149ca3..d88c2ee 100644
--- a/tests/012-table-out.phpt
+++ b/tests/012-table-out.phpt
@@ -2,11 +2,11 @@
 Table out variations
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrantTable(TT_TABLE_HOST, TT_TABLE_PORT);
 $tt->vanish();
diff --git a/tests/013-size.phpt b/tests/013-size.phpt
index 2f5e868..1e4a69a 100644
--- a/tests/013-size.phpt
+++ b/tests/013-size.phpt
@@ -2,11 +2,11 @@
 Test size
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 $tt->vanish();
diff --git a/tests/014-fwmkeys.phpt b/tests/014-fwmkeys.phpt
index 12b495d..7cdfd3b 100644
--- a/tests/014-fwmkeys.phpt
+++ b/tests/014-fwmkeys.phpt
@@ -2,11 +2,11 @@
 Test forward matching keys
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 $tt->vanish();
diff --git a/tests/015-num.phpt b/tests/015-num.phpt
index f7aa54f..7772f71 100644
--- a/tests/015-num.phpt
+++ b/tests/015-num.phpt
@@ -2,11 +2,11 @@
 Test number of records
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 $tt->vanish();
diff --git a/tests/016-key-prefix.phpt b/tests/016-key-prefix.phpt
index e419e67..1867a45 100644
--- a/tests/016-key-prefix.phpt
+++ b/tests/016-key-prefix.phpt
@@ -2,11 +2,11 @@
 Testing key prefix
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 $tt->vanish();
diff --git a/tests/017-session-handler.phpt b/tests/017-session-handler.phpt
index d355708..953dcb5 100644
--- a/tests/017-session-handler.phpt
+++ b/tests/017-session-handler.phpt
@@ -2,11 +2,11 @@
 Session handler
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 ini_set("tokyo_tyrant.session_salt", sha1(mt_rand(1, 100)));
 ini_set("session.save_path", sprintf("tcp://%s:%d", TT_TABLE_HOST, TT_TABLE_PORT));
diff --git a/tests/018-metasearch.phpt b/tests/018-metasearch.phpt
index afc5a85..5dbf910 100644
--- a/tests/018-metasearch.phpt
+++ b/tests/018-metasearch.phpt
@@ -2,14 +2,14 @@
 Metasearch test
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 
 if (!method_exists('TokyoTyrantQuery', 'metaSearch'))
 	die("skip No metasearch available");
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrantTable(TT_TABLE_HOST, TT_TABLE_PORT);
 $tt->vanish();
diff --git a/tests/019-hint.phpt b/tests/019-hint.phpt
index 0566e61..8c8d3d1 100644
--- a/tests/019-hint.phpt
+++ b/tests/019-hint.phpt
@@ -2,14 +2,14 @@
 Hint test
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 
 if (!method_exists('TokyoTyrantQuery', 'hint'))
 	die("skip No hint available");
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrantTable(TT_TABLE_HOST, TT_TABLE_PORT);
 $tt->vanish();
diff --git a/tests/020-large-out.phpt b/tests/020-large-out.phpt
index 3515c37..c6b5799 100644
--- a/tests/020-large-out.phpt
+++ b/tests/020-large-out.phpt
@@ -2,11 +2,11 @@
 Test a large out query. (Might fail)
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrantTable(TT_TABLE_HOST, TT_TABLE_PORT);
 $tt->vanish();
diff --git a/tests/021-binarysafe.phpt b/tests/021-binarysafe.phpt
index 736aac4..794beef 100644
--- a/tests/021-binarysafe.phpt
+++ b/tests/021-binarysafe.phpt
@@ -2,11 +2,11 @@
 Test string with null char in the middle of value
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 function output_ord($string, $len) {
 	for ($i = 0; $i < $len; $i++) {
diff --git a/tests/022-binarysafe-key.phpt b/tests/022-binarysafe-key.phpt
index 954e3bb..7433a39 100644
--- a/tests/022-binarysafe-key.phpt
+++ b/tests/022-binarysafe-key.phpt
@@ -2,11 +2,11 @@
 Test string with null char in the middle of key
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 $tt->vanish();
diff --git a/tests/023-iterate-kv.phpt b/tests/023-iterate-kv.phpt
index d51eb63..c21c1c6 100644
--- a/tests/023-iterate-kv.phpt
+++ b/tests/023-iterate-kv.phpt
@@ -2,11 +2,11 @@
 Iterate a kv storage
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrant(TT_HOST, TT_PORT);
 $tt->vanish();
diff --git a/tests/024-iterate-table.phpt b/tests/024-iterate-table.phpt
index a83fc26..7c5991b 100644
--- a/tests/024-iterate-table.phpt
+++ b/tests/024-iterate-table.phpt
@@ -2,11 +2,11 @@
 Iterate a table storage
 --SKIPIF--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrantTable(TT_TABLE_HOST, TT_TABLE_PORT);
 $tt->vanish();
diff --git a/tests/025-table-multiget.phpt b/tests/025-table-multiget.phpt
index e741f78..77be2cb 100644
--- a/tests/025-table-multiget.phpt
+++ b/tests/025-table-multiget.phpt
@@ -3,11 +3,11 @@ Test multiget on a table
 --SKIPIF--
 --XFAIL--
 <?php
-include dirname(__FILE__) . "/skipif.inc.php";
+include dirname(__FILE__) . "/skipif.inc";
 ?>
 --FILE--
 <?php
-include 'config.inc.php';
+include dirname(__FILE__) . '/config.inc';
 
 $tt = new TokyoTyrantTable(TT_TABLE_HOST, TT_TABLE_PORT);
 $tt->vanish();
diff --git a/tests/config.inc.php b/tests/config.inc
similarity index 100%
rename from tests/config.inc.php
rename to tests/config.inc
diff --git a/tests/skipif.inc.php b/tests/skipif.inc
similarity index 100%
rename from tests/skipif.inc.php
rename to tests/skipif.inc