sas Thu Oct 3 04:07:22 2002 EDT
Modified files:
/php4/ext/session/tests 001.phpt 003.phpt 004.phpt 005.phpt
006.phpt 007.phpt 008.phpt
Log:
Purge ini_set calls and replace through INI sections.
Index: php4/ext/session/tests/001.phpt
diff -u php4/ext/session/tests/001.phpt:1.5 php4/ext/session/tests/001.phpt:1.6
--- php4/ext/session/tests/001.phpt:1.5 Fri Apr 19 03:55:24 2002
+++ php4/ext/session/tests/001.phpt Thu Oct 3 04:07:21 2002
@@ -2,10 +2,10 @@
Session Object Serialization
--SKIPIF--
<?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
--FILE--
<?php
-
-ini_set("register_globals", 1);
class foo {
var $bar = "ok";
Index: php4/ext/session/tests/003.phpt
diff -u php4/ext/session/tests/003.phpt:1.7 php4/ext/session/tests/003.phpt:1.8
--- php4/ext/session/tests/003.phpt:1.7 Fri Apr 19 03:55:24 2002
+++ php4/ext/session/tests/003.phpt Thu Oct 3 04:07:21 2002
@@ -2,10 +2,10 @@
Session Object Deserialization
--SKIPIF--
<?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
--FILE--
<?php
-
-ini_set("register_globals", 1);
class foo {
var $bar = "ok";
Index: php4/ext/session/tests/004.phpt
diff -u php4/ext/session/tests/004.phpt:1.8 php4/ext/session/tests/004.phpt:1.9
--- php4/ext/session/tests/004.phpt:1.8 Fri Apr 19 03:55:24 2002
+++ php4/ext/session/tests/004.phpt Thu Oct 3 04:07:21 2002
@@ -2,10 +2,11 @@
session_set_save_handler test
--SKIPIF--
<?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
--FILE--
<?php
error_reporting(~E_NOTICE);
-ini_set("register_globals", 1);
class handler {
var $data =
'baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}';
Index: php4/ext/session/tests/005.phpt
diff -u php4/ext/session/tests/005.phpt:1.6 php4/ext/session/tests/005.phpt:1.7
--- php4/ext/session/tests/005.phpt:1.6 Fri Apr 19 03:55:24 2002
+++ php4/ext/session/tests/005.phpt Thu Oct 3 04:07:21 2002
@@ -2,10 +2,10 @@
Custom save handler, multiple session_start()s, complex data structure test.
--SKIPIF--
<?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
--FILE--
<?php
-
-ini_set("register_globals", 1);
error_reporting(E_ALL & ~E_NOTICE);
Index: php4/ext/session/tests/006.phpt
diff -u php4/ext/session/tests/006.phpt:1.6 php4/ext/session/tests/006.phpt:1.7
--- php4/ext/session/tests/006.phpt:1.6 Fri Apr 19 03:55:24 2002
+++ php4/ext/session/tests/006.phpt Thu Oct 3 04:07:21 2002
@@ -2,11 +2,11 @@
References between variables in sessions
--SKIPIF--
<?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
--FILE--
<?php
error_reporting(E_ALL & ~E_NOTICE);
-
-ini_set("register_globals", 1);
ob_start();
session_id("abtest");
Index: php4/ext/session/tests/007.phpt
diff -u php4/ext/session/tests/007.phpt:1.2 php4/ext/session/tests/007.phpt:1.3
--- php4/ext/session/tests/007.phpt:1.2 Thu Oct 3 02:33:19 2002
+++ php4/ext/session/tests/007.phpt Thu Oct 3 04:07:21 2002
@@ -2,12 +2,12 @@
Verify PHP 4.2 compatibility: unset($c) with enabled register_globals
--SKIPIF--
<?php include('skipif.inc'); ?>
+--INI--
+register_globals=1
+session.bug_compat_42=1
--FILE--
<?php
error_reporting(E_ALL & ~E_NOTICE);
-
-ini_set("register.globals", 1);
-ini_set("session.bug_compat_42", 1);
ob_start();
session_id("abtest");
Index: php4/ext/session/tests/008.phpt
diff -u php4/ext/session/tests/008.phpt:1.2 php4/ext/session/tests/008.phpt:1.3
--- php4/ext/session/tests/008.phpt:1.2 Thu Oct 3 02:41:25 2002
+++ php4/ext/session/tests/008.phpt Thu Oct 3 04:07:21 2002
@@ -2,13 +2,13 @@
Verify PHP 4.2 compatibility: global is used albeit register_globals=0
--SKIPIF--
<?php include('skipif.inc'); ?>
+--INI--
+register_globals=0
+session.bug_compat_42=1
+session.bug_compat_warn=0
--FILE--
<?php
error_reporting(E_ALL & ~E_NOTICE);
-
-ini_set("register.globals", 0);
-ini_set("session.bug_compat_42", 1);
-ini_set("session.bug_compat_warn", 0);
ob_start();
session_id("abtest");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
