Commit:    621fddab93468219aafb0392c7056e551defa1fa
Author:    Anatoliy Belsky <a...@php.net>         Tue, 22 May 2012 18:41:03 
+0200
Parents:   faca4e08b4dffbf00b1bc20fc5d4e310b3f99c13
Branches:  PHP-5.3 PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=621fddab93468219aafb0392c7056e551defa1fa

Log:
Fix bug #62109 tests\basic\bug46313-win.phpt fails

Bugs:
https://bugs.php.net/62109
https://bugs.php.net/46313

Changed paths:
  M  tests/basic/bug46313-win.phpt


Diff:
diff --git a/tests/basic/bug46313-win.phpt b/tests/basic/bug46313-win.phpt
index 87786d4..350134e 100644
--- a/tests/basic/bug46313-win.phpt
+++ b/tests/basic/bug46313-win.phpt
@@ -6,6 +6,7 @@ Bug #46313 (Magic quotes broke $_FILES)
 magic_quotes_gpc=1
 file_uploads=1
 register_globals=1
+display_errors=0
 --POST_RAW--
 Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
@@ -26,19 +27,19 @@ var_dump($GLOBALS["o1\'file_name"]);
 var_dump($GLOBALS["o1\'file_name"] === $_FILES["o1\'file"]["name"]);
 var_dump($GLOBALS["o1\'file"]);
 var_dump($GLOBALS["o1\'file"] === $_FILES["o1\'file"]["tmp_name"]);
+/* The windows policy is walking to the last (single)quote in a file name and 
taking the remain.
+   This way some'file.gif becomes file.gif */
 ?>
 --EXPECTF--
-Deprecated: Directive 'register_globals' is deprecated in PHP 5.3 and greater 
in Unknown on line 0
-Deprecated: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater 
in Unknown on line 0
 array(2) {
   ["o1\'file"]=>
   array(5) {
     ["name"]=>
-    string(12) "o1"
+    string(8) "file.png"
     ["type"]=>
     string(16) "text/plain-file1"
     ["tmp_name"]=>
-    string(14) "%s"
+    string(%d) "%s.tmp"
     ["error"]=>
     int(0)
     ["size"]=>
@@ -47,18 +48,18 @@ array(2) {
   ["o2\'file"]=>
   array(5) {
     ["name"]=>
-    string(13) "o2"
+    string(9) "file2.txt"
     ["type"]=>
     string(16) "text/plain-file2"
     ["tmp_name"]=>
-    string(14) "%s"
+    string(%d) "%s.tmp"
     ["error"]=>
     int(0)
     ["size"]=>
     int(1)
   }
 }
-string(12) "o1"
+string(8) "file.png"
 bool(true)
 string(%d) "%s"
 bool(true)


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

Reply via email to