com php-src: fork tests: ext/session/tests/bug60860-win32.phpt ext/session/tests/bug60860.phpt ext/session/tests/session_set
_save_handler_class_014-win32.phpt ext/se ssion/tests/session_set_save_handler_class_014 .phpt
| From: | Anatol Belski | Date: | Mon, 26 Dec 2016 20:38:27 +0000 |
| Subject: | com php-src: fork tests: ext/session/tests/bug60860-win32.phpt ext/session/tests/bug60860.phpt ext/session/tests/session_set _save_handler_class_014-win32.phpt ext/se ssion/tests/session_set_save_handler_class_014 .phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96435@lists.php.net to get a copy of this message | ||
Commit: 0d31433111aa1e46f6e8262da4455f133844c415
Author: Anatol Belski <ab@php.net> Mon, 26 Dec 2016 21:37:34 +0100
Parents: d9c4b49c8aa6ca3af742b066ac38f02c81ad5401
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0d31433111aa1e46f6e8262da4455f133844c415
Log:
fork tests
Changed paths:
A ext/session/tests/bug60860-win32.phpt
M ext/session/tests/bug60860.phpt
A ext/session/tests/session_set_save_handler_class_014-win32.phpt
M ext/session/tests/session_set_save_handler_class_014.phpt
Diff:
diff --git a/ext/session/tests/bug60860-win32.phpt b/ext/session/tests/bug60860-win32.phpt
new file mode 100644
index 0000000..665ab94
--- /dev/null
+++ b/ext/session/tests/bug60860-win32.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Bug #60860 (session.save_handler=user without defined function core dumps)
+--SKIPIF--
+<?php
+include('skipif.inc');
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+ die('skip only for Windows');
+}
+?>
+--INI--
+session.save_handler=user
+display_errors=off
+--FILE--
+<?php
+
+session_start();
+echo "ok\n";
+
+?>
+--EXPECTF--
+ok
+PHP Recoverable fatal error: PHP Startup: Cannot set 'user' save handler by ini_set() or
sesion_module_name() in Unknown on line 0
+
diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt
index 9d0f745..87a6290 100644
--- a/ext/session/tests/bug60860.phpt
+++ b/ext/session/tests/bug60860.phpt
@@ -1,7 +1,12 @@
--TEST--
Bug #60860 (session.save_handler=user without defined function core dumps)
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+include('skipif.inc');
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+ die('skip not for Windows');
+}
+?>
--INI--
session.save_handler=user
display_errors=off
diff --git a/ext/session/tests/session_set_save_handler_class_014-win32.phpt
b/ext/session/tests/session_set_save_handler_class_014-win32.phpt
new file mode 100644
index 0000000..e945e00
--- /dev/null
+++ b/ext/session/tests/session_set_save_handler_class_014-win32.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Test session_set_save_handler() : calling default handler when save_handler=user
+--INI--
+session.save_handler=user
+session.name=PHPSESSID
+display_errors=off
+--SKIPIF--
+<?php
+include('skipif.inc');
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+ die('skip only for Windows');
+}
+?>
+--FILE--
+<?php
+
+ob_start();
+
+/*
+ * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool
$register_shutdown_function = true])
+ * Description : Sets user-level session storage functions
+ * Source code : ext/session/session.c
+ */
+
+echo "*** Testing session_set_save_handler() : calling default handler when save_handler=user
***\n";
+
+$oldHandler = ini_get('session.save_handler');
+$handler = new SessionHandler;
+session_set_save_handler($handler);
+
+session_start();
+
+--EXPECTF--
+*** Testing session_set_save_handler() : calling default handler when save_handler=user ***
+PHP Recoverable fatal error: PHP Startup: Cannot set 'user' save handler by ini_set() or
sesion_module_name() in Unknown on line 0
+
diff --git a/ext/session/tests/session_set_save_handler_class_014.phpt
b/ext/session/tests/session_set_save_handler_class_014.phpt
index 5679c81..cddaefd 100644
--- a/ext/session/tests/session_set_save_handler_class_014.phpt
+++ b/ext/session/tests/session_set_save_handler_class_014.phpt
@@ -5,7 +5,12 @@ session.save_handler=user
session.name=PHPSESSID
display_errors=off
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+include('skipif.inc');
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+ die('skip not for Windows');
+}
+?>
--FILE--
<?php
@@ -27,4 +32,5 @@ session_start();
--EXPECTF--
PHP Recoverable fatal error: PHP Startup: Cannot set 'user' save handler by ini_set() or
sesion_module_name() in Unknown on line 0
-*** Testing session_set_save_handler() : calling default handler when save_handler=user ***
\ No newline at end of file
+*** Testing session_set_save_handler() : calling default handler when save_handler=user ***
+