pajoye                                   Thu, 01 Sep 2011 13:28:12 +0000

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

Log:
- use %s, bad c/p

Changed paths:
    D   php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob-win32.phpt
    U   
php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt

Deleted: 
php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob-win32.phpt    
2011-09-01 13:28:00 UTC (rev 315987)
+++ php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob-win32.phpt    
2011-09-01 13:28:12 UTC (rev 315988)
@@ -1,59 +0,0 @@
---TEST--
-Test open_basedir configuration
---SKIPIF--
-<?php
-if (substr(PHP_OS, 0, 3) != 'WIN') {
-    die('skip Windows only variation');
-}
-?>
---INI--
-open_basedir=.
---FILE--
-<?php
-require_once "open_basedir.inc";
-test_open_basedir("glob");
-?>
---CLEAN--
-<?php
-require_once "open_basedir.inc";
-delete_directories();
-?>
---EXPECTF--
-*** Testing open_basedir configuration [glob] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(false)
-array(0) {
-}
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-array(1) {
-  [0]=>
-  string(5) "../ok"
-}
-array(1) {
-  [0]=>
-  string(6) "ok.txt"
-}
-array(1) {
-  [0]=>
-  string(12) "../ok/ok.txt"
-}
-array(1) {
-  [0]=>
-  string(%d) "%s/test/ok/ok.txt"
-}
-array(1) {
-  [0]=>
-  string(%d) "%s/test/ok/../ok/ok.txt"
-}
-*** Finished testing open_basedir configuration [glob] ***
-

Modified: 
php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt
===================================================================
--- 
php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt    
    2011-09-01 13:28:00 UTC (rev 315987)
+++ 
php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt    
    2011-09-01 13:28:12 UTC (rev 315988)
@@ -37,46 +37,39 @@
 bool(true)
 bool(true)

-Warning: parse_ini_file(): open_basedir restriction in effect. 
File(%s\test\bad) is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. 
File(%stest\bad) is not within the allowed path(s): (.) in 
%sopen_basedir_parse_ini_file.php on line 6

-Warning: parse_ini_file(%s\test\bad): failed to open stream: %s in %s on line 
%d
-array(0) {
-}
+Warning: parse_ini_file(%stest\bad): failed to open stream: Operation not 
permitted in %sopen_basedir_parse_ini_file.php on line 6
+bool(false)

-Warning: parse_ini_file(): open_basedir restriction in effect. 
File(%s\test\bad\bad.txt) is not within the allowed path(s): (.) in %s on line 
%d
+Warning: parse_ini_file(): open_basedir restriction in effect. 
File(%stest\bad\bad.txt) is not within the allowed path(s): (.) in 
%sopen_basedir_parse_ini_file.php on line 7

-Warning: parse_ini_file(%s\test\bad\bad.txt): failed to open stream: %s in %s 
on line %d
-array(0) {
-}
+Warning: parse_ini_file(%stest\bad\bad.txt): failed to open stream: Operation 
not permitted in %sopen_basedir_parse_ini_file.php on line 7
+bool(false)

-Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test) 
is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is 
not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on 
line 8

-Warning: parse_ini_file(%s\test): failed to open stream: %s in %s on line %d
-array(0) {
-}
+Warning: parse_ini_file(%stest): failed to open stream: Operation not 
permitted in %sopen_basedir_parse_ini_file.php on line 8
+bool(false)

-Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test) 
is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is 
not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on 
line 9

-Warning: parse_ini_file(%s\test): failed to open stream: %s in %s on line %d
-array(0) {
-}
+Warning: parse_ini_file(%stest): failed to open stream: Operation not 
permitted in %sopen_basedir_parse_ini_file.php on line 9
+bool(false)

-Warning: parse_ini_file(): open_basedir restriction in effect. 
File(%s\test\bad) is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. 
File(%stest\bad) is not within the allowed path(s): (.) in 
%sopen_basedir_parse_ini_file.php on line 10

-Warning: parse_ini_file(%s\test\bad): failed to open stream: %s in %s on line 
%d
-array(0) {
-}
+Warning: parse_ini_file(%stest\bad): failed to open stream: Operation not 
permitted in %sopen_basedir_parse_ini_file.php on line 10
+bool(false)

-Warning: parse_ini_file(): open_basedir restriction in effect. 
File(%s\test\bad\bad.txt) is not within the allowed path(s): (.) in %s on line 
%d
+Warning: parse_ini_file(): open_basedir restriction in effect. 
File(%stest\bad\bad.txt) is not within the allowed path(s): (.) in 
%sopen_basedir_parse_ini_file.php on line 11

-Warning: parse_ini_file(%s\test\bad\bad.txt): failed to open stream: %s in %s 
on line %d
-array(0) {
-}
+Warning: parse_ini_file(%stest\bad\bad.txt): failed to open stream: Operation 
not permitted in %sopen_basedir_parse_ini_file.php on line 11
+bool(false)

-Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test) 
is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is 
not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on 
line 12

-Warning: parse_ini_file(%s\test): failed to open stream: %s in %s on line %d
-array(0) {
-}
+Warning: parse_ini_file(%stest): failed to open stream: Operation not 
permitted in %sopen_basedir_parse_ini_file.php on line 12
+bool(false)
 *** Finished testing open_basedir configuration [parse_ini_file] ***


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

Reply via email to