sixd                                     Mon, 26 Sep 2011 20:31:11 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=317348

Log:
MFH to fix PHP_5_3 diffs shown on http://qa.php.net/reports/?version=5.3.9-dev

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/015.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/018.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/020.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/021.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/bug36459.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/bug41600.phpt

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt     2011-09-26 
20:26:12 UTC (rev 317347)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt     2011-09-26 
20:31:11 UTC (rev 317348)
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
-session.use_trans_sid=1
+session.use_trans_sid=0
 session.use_cookies=0
 session.cache_limiter=
 register_globals=1
@@ -22,11 +22,11 @@
 ?>
 <a href="/link">
 <?php
-ini_set("session.use_trans_sid","0");
+ini_set("session.use_trans_sid","1");
 ?>
 <a href="/link">
 <?php
-ini_set("session.use_trans_sid","1");
+ini_set("session.use_trans_sid","0");
 ?>
 <a href="/link">
 <?php
@@ -34,10 +34,10 @@
 ?>
 --EXPECTF--
 Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater 
in Unknown on line 0
-<a href="/link?PHPSESSID=abtest">
+<a href="/link">

 Warning: ini_set(): A session is active. You cannot change the session 
module's ini settings at this time in %s on line %d
-<a href="/link?PHPSESSID=abtest">
+<a href="/link">

 Warning: ini_set(): A session is active. You cannot change the session 
module's ini settings at this time in %s on line %d
-<a href="/link?PHPSESSID=abtest">
+<a href="/link">

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/015.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/015.phpt     2011-09-26 
20:26:12 UTC (rev 317347)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/015.phpt     2011-09-26 
20:31:11 UTC (rev 317348)
@@ -5,6 +5,7 @@
 --INI--
 session.use_trans_sid=1
 session.use_cookies=0
+session.use_only_cookies=0
 session.cache_limiter=
 arg_separator.output=&
 session.name=PHPSESSID

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/018.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/018.phpt     2011-09-26 
20:26:12 UTC (rev 317347)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/018.phpt     2011-09-26 
20:31:11 UTC (rev 317348)
@@ -4,6 +4,7 @@
 <?php include('skipif.inc'); ?>
 --INI--
 session.use_cookies=0
+session.use_only_cookies=0
 session.cache_limiter=
 session.use_trans_sid=1
 session.name=PHPSESSID

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/020.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/020.phpt     2011-09-26 
20:26:12 UTC (rev 317347)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/020.phpt     2011-09-26 
20:31:11 UTC (rev 317348)
@@ -4,6 +4,7 @@
 <?php include('skipif.inc'); ?>
 --INI--
 session.use_cookies=0
+session.use_only_cookies=0
 session.cache_limiter=
 session.use_trans_sid=1
 arg_separator.output="&amp;"

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/021.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/021.phpt     2011-09-26 
20:26:12 UTC (rev 317347)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/021.phpt     2011-09-26 
20:31:11 UTC (rev 317348)
@@ -4,6 +4,7 @@
 <?php include('skipif.inc'); ?>
 --INI--
 session.use_cookies=0
+session.use_only_cookies=0
 session.cache_limiter=
 session.use_trans_sid=1
 url_rewriter.tags="a=href,area=href,frame=src,input=src,form=,fieldset="

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/bug36459.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/bug36459.phpt        
2011-09-26 20:26:12 UTC (rev 317347)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/bug36459.phpt        
2011-09-26 20:31:11 UTC (rev 317348)
@@ -5,6 +5,7 @@
 --INI--
 session.use_trans_sid=1
 session.use_cookies=0
+session.use_only_cookies=0
 session.name=sid
 --FILE--
 <?php

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/bug41600.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/bug41600.phpt        
2011-09-26 20:26:12 UTC (rev 317347)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/bug41600.phpt        
2011-09-26 20:31:11 UTC (rev 317348)
@@ -4,6 +4,7 @@
 <?php include('skipif.inc'); ?>
 --INI--
 session.use_cookies=0
+session.use_only_cookies=0
 session.cache_limiter=
 session.use_trans_sid=1
 arg_separator.output="&amp;"

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to