stas                                     Wed, 31 Aug 2011 04:24:48 +0000

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

Log:
fix tests

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/zlib/tests/gzencode_variation2.phpt
    U   php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_003.phpt
    U   php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_004.phpt
    U   php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_005.phpt
    U   php/php-src/branches/PHP_5_4/tests/security/open_basedir_linkinfo.phpt
    U   php/php-src/branches/PHP_5_4/tests/security/open_basedir_readlink.phpt
    U   php/php-src/trunk/ext/zlib/tests/gzencode_variation2.phpt
    U   php/php-src/trunk/ext/zlib/tests/ob_003.phpt
    U   php/php-src/trunk/ext/zlib/tests/ob_004.phpt
    U   php/php-src/trunk/ext/zlib/tests/ob_005.phpt
    U   php/php-src/trunk/tests/security/open_basedir_linkinfo.phpt
    U   php/php-src/trunk/tests/security/open_basedir_readlink.phpt

Modified: php/php-src/branches/PHP_5_4/ext/zlib/tests/gzencode_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/zlib/tests/gzencode_variation2.phpt        
2011-08-31 03:23:29 UTC (rev 315844)
+++ php/php-src/branches/PHP_5_4/ext/zlib/tests/gzencode_variation2.phpt        
2011-08-31 04:24:48 UTC (rev 315845)
@@ -1,7 +1,7 @@
 --TEST--
 Test gzencode() function : variation - verify header contents with all 
encoding modes
 --XFAIL--
-Test will fail until bug #47178 resolved; missing gzip headers whne 
FORCE_DEFLATE specified
+Test will fail until bug #47178 resolved; missing gzip headers when 
FORCE_DEFLATE specified
 --SKIPIF--
 <?php


Modified: php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_003.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_003.phpt     2011-08-31 
03:23:29 UTC (rev 315844)
+++ php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_003.phpt     2011-08-31 
04:24:48 UTC (rev 315845)
@@ -17,9 +17,7 @@
 echo "hi\n";
 ?>
 --EXPECTF--
-%s
+�%s
+--EXPECTHEADERS--
 Content-Encoding: gzip
 Vary: Accept-Encoding
-%s
-
-�%s

Modified: php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_004.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_004.phpt     2011-08-31 
03:23:29 UTC (rev 315844)
+++ php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_004.phpt     2011-08-31 
04:24:48 UTC (rev 315845)
@@ -17,9 +17,8 @@
 echo "hi\n";
 ?>
 --EXPECTF--
-%s
+�%s
+--EXPECTHEADERS--
 Content-Encoding: gzip
 Vary: Accept-Encoding
-%s

-�%s

Modified: php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_005.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_005.phpt     2011-08-31 
03:23:29 UTC (rev 315844)
+++ php/php-src/branches/PHP_5_4/ext/zlib/tests/ob_005.phpt     2011-08-31 
04:24:48 UTC (rev 315845)
@@ -18,4 +18,5 @@
 echo "hi\n";
 ?>
 --EXPECTF--
-%shi
+hi
+--EXPECTHEADERS--

Modified: php/php-src/branches/PHP_5_4/tests/security/open_basedir_linkinfo.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/tests/security/open_basedir_linkinfo.phpt      
2011-08-31 03:23:29 UTC (rev 315844)
+++ php/php-src/branches/PHP_5_4/tests/security/open_basedir_linkinfo.phpt      
2011-08-31 04:24:48 UTC (rev 315845)
@@ -6,10 +6,13 @@
     die('skip no symlinks on Windows');
 }
 ?>
---INI--
-open_basedir=.
+--XFAIL--
+BUG: open_basedir cannot delete symlink to prohibited file. See also
+bugs 48111 and 52176.
 --FILE--
 <?php
+chdir(__DIR__);
+ini_set("open_basedir", ".");
 require_once "open_basedir.inc";
 $initdir = getcwd();
 test_open_basedir_before("linkinfo", FALSE);

Modified: php/php-src/branches/PHP_5_4/tests/security/open_basedir_readlink.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/tests/security/open_basedir_readlink.phpt      
2011-08-31 03:23:29 UTC (rev 315844)
+++ php/php-src/branches/PHP_5_4/tests/security/open_basedir_readlink.phpt      
2011-08-31 04:24:48 UTC (rev 315845)
@@ -6,10 +6,10 @@
     die('skip no symlinks on Windows');
 }
 ?>
---INI--
-open_basedir=.
 --FILE--
 <?php
+chdir(__DIR__);
+ini_set("open_basedir", ".");
 require_once "open_basedir.inc";
 $initdir = getcwd();
 test_open_basedir_before("readlink", FALSE);
@@ -32,7 +32,6 @@
 $symlink = ($initdir."/test/ok/symlink.txt");
 var_dump(symlink($target, $symlink));
 var_dump(readlink($symlink));
-var_dump(unlink($symlink));

 test_open_basedir_after("readlink");
 ?>
@@ -69,6 +68,5 @@

 Warning: readlink(): open_basedir restriction in effect. 
File(%s/test/ok/symlink.txt) is not within the allowed path(s): (.) in %s on 
line %d
 bool(false)
-bool(true)
 *** Finished testing open_basedir configuration [readlink] ***


Modified: php/php-src/trunk/ext/zlib/tests/gzencode_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/zlib/tests/gzencode_variation2.phpt   2011-08-31 
03:23:29 UTC (rev 315844)
+++ php/php-src/trunk/ext/zlib/tests/gzencode_variation2.phpt   2011-08-31 
04:24:48 UTC (rev 315845)
@@ -1,7 +1,7 @@
 --TEST--
 Test gzencode() function : variation - verify header contents with all 
encoding modes
 --XFAIL--
-Test will fail until bug #47178 resolved; missing gzip headers whne 
FORCE_DEFLATE specified
+Test will fail until bug #47178 resolved; missing gzip headers when 
FORCE_DEFLATE specified
 --SKIPIF--
 <?php


Modified: php/php-src/trunk/ext/zlib/tests/ob_003.phpt
===================================================================
--- php/php-src/trunk/ext/zlib/tests/ob_003.phpt        2011-08-31 03:23:29 UTC 
(rev 315844)
+++ php/php-src/trunk/ext/zlib/tests/ob_003.phpt        2011-08-31 04:24:48 UTC 
(rev 315845)
@@ -17,9 +17,7 @@
 echo "hi\n";
 ?>
 --EXPECTF--
-%s
+�%s
+--EXPECTHEADERS--
 Content-Encoding: gzip
 Vary: Accept-Encoding
-%s
-
-�%s

Modified: php/php-src/trunk/ext/zlib/tests/ob_004.phpt
===================================================================
--- php/php-src/trunk/ext/zlib/tests/ob_004.phpt        2011-08-31 03:23:29 UTC 
(rev 315844)
+++ php/php-src/trunk/ext/zlib/tests/ob_004.phpt        2011-08-31 04:24:48 UTC 
(rev 315845)
@@ -17,9 +17,8 @@
 echo "hi\n";
 ?>
 --EXPECTF--
-%s
+�%s
+--EXPECTHEADERS--
 Content-Encoding: gzip
 Vary: Accept-Encoding
-%s

-�%s

Modified: php/php-src/trunk/ext/zlib/tests/ob_005.phpt
===================================================================
--- php/php-src/trunk/ext/zlib/tests/ob_005.phpt        2011-08-31 03:23:29 UTC 
(rev 315844)
+++ php/php-src/trunk/ext/zlib/tests/ob_005.phpt        2011-08-31 04:24:48 UTC 
(rev 315845)
@@ -18,4 +18,5 @@
 echo "hi\n";
 ?>
 --EXPECTF--
-%shi
+hi
+--EXPECTHEADERS--

Modified: php/php-src/trunk/tests/security/open_basedir_linkinfo.phpt
===================================================================
--- php/php-src/trunk/tests/security/open_basedir_linkinfo.phpt 2011-08-31 
03:23:29 UTC (rev 315844)
+++ php/php-src/trunk/tests/security/open_basedir_linkinfo.phpt 2011-08-31 
04:24:48 UTC (rev 315845)
@@ -6,10 +6,13 @@
     die('skip no symlinks on Windows');
 }
 ?>
---INI--
-open_basedir=.
+--XFAIL--
+BUG: open_basedir cannot delete symlink to prohibited file. See also
+bugs 48111 and 52176.
 --FILE--
 <?php
+chdir(__DIR__);
+ini_set("open_basedir", ".");
 require_once "open_basedir.inc";
 $initdir = getcwd();
 test_open_basedir_before("linkinfo", FALSE);

Modified: php/php-src/trunk/tests/security/open_basedir_readlink.phpt
===================================================================
--- php/php-src/trunk/tests/security/open_basedir_readlink.phpt 2011-08-31 
03:23:29 UTC (rev 315844)
+++ php/php-src/trunk/tests/security/open_basedir_readlink.phpt 2011-08-31 
04:24:48 UTC (rev 315845)
@@ -6,10 +6,10 @@
     die('skip no symlinks on Windows');
 }
 ?>
---INI--
-open_basedir=.
 --FILE--
 <?php
+chdir(__DIR__);
+ini_set("open_basedir", ".");
 require_once "open_basedir.inc";
 $initdir = getcwd();
 test_open_basedir_before("readlink", FALSE);
@@ -32,7 +32,6 @@
 $symlink = ($initdir."/test/ok/symlink.txt");
 var_dump(symlink($target, $symlink));
 var_dump(readlink($symlink));
-var_dump(unlink($symlink));

 test_open_basedir_after("readlink");
 ?>
@@ -69,6 +68,5 @@

 Warning: readlink(): open_basedir restriction in effect. 
File(%s/test/ok/symlink.txt) is not within the allowed path(s): (.) in %s on 
line %d
 bool(false)
-bool(true)
 *** Finished testing open_basedir configuration [readlink] ***


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

Reply via email to