Merge branch 'master' of github.com:php/php-src

* 'master' of github.com:php/php-src:
  Fix upload_2G test

Author: krakjoe

sapi/cli/tests/upload_2G.phpt

@@ -97,9 +97,11 @@ Content-type: text/html; charset=UTF-8
 
 array(1) {
   ["file1"]=>
-  array(5) {
+  array(6) {
     ["name"]=>
     string(9) "file1.txt"
+    ["full_path"]=>
+    string(9) "file1.txt"
     ["type"]=>
     string(10) "text/plain"
     ["tmp_name"]=>