merge 9eb5cb6571698ca1c623ad3e02c8727c4b0c9a09 to 5.3

diff --git a/ext/standard/tests/file/umask_variation3.phpt b/ext/standard/tests/file/umask_variation3.phpt
index 1483dc430e590321b4fd6634ae86938ba49f698a..cb34294fea60c8de88d5087dd0f1d8647834b9f0 100644 (file)
--- a/ext/standard/tests/file/umask_variation3.phpt
+++ b/ext/standard/tests/file/umask_variation3.phpt
@@ -110,7 +110,7 @@ foreach($inputs as $key =>$value) {
       echo "\n--$key--\n";
       umask(0);
       var_dump(umask($value));
-      var_dump( umask());
+      var_dump(umask() & 0777);
 };
 
 ?>