This commit was manufactured by cvs2svn to create branch 'PHP_5_0'.

diff --git a/ext/mysqli/tests/skipif.inc b/ext/mysqli/tests/skipif.inc
new file mode 100644 (file)
index 0000000..68a9c7c
--- /dev/null
+++ b/ext/mysqli/tests/skipif.inc
@@ -0,0 +1,4 @@
+<?php
+  if (!extension_loaded('mysqli'))
+    die('skip mysqli extension not available');
+?>

diff --git a/ext/session/tests/bug31454.phpt b/ext/session/tests/bug31454.phpt
new file mode 100644 (file)
index 0000000..85ada11
--- /dev/null
+++ b/ext/session/tests/bug31454.phpt
@@ -0,0 +1,19 @@
+--TEST--
+bug #31454 (session_set_save_handler crashes PHP when supplied non-existent object ref)
+--FILE--
+<?php
+
+session_set_save_handler(
+       array(&$arf, 'open'),
+       array(&$arf, 'close'),
+       array(&$arf, 'read'),
+       array(&$arf, 'write'),
+       array(&$arf, 'destroy'),
+       array(&$arf, 'gc'));
+       
+echo "Done\n";
+?>
+--EXPECTF--
+
+Warning: session_set_save_handler(): Argument 1 is not a valid callback in %s/bug31454.php on line %d
+Done