Rename $_FILES[][fullpath] to $_FILES[][full_path].

Björn Tantau · Björn Tantau · commit 47d851d9026b · 2021-05-11T16:27:09.000+02:00
diff --git a/ext/session/tests/rfc1867.phpt b/ext/session/tests/rfc1867.phpt
@@ -57,7 +57,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -72,7 +72,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_cleanup.phpt b/ext/session/tests/rfc1867_cleanup.phpt
@@ -57,7 +57,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -72,7 +72,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_disabled.phpt b/ext/session/tests/rfc1867_disabled.phpt
@@ -50,7 +50,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -65,7 +65,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_disabled_2.phpt b/ext/session/tests/rfc1867_disabled_2.phpt
@@ -50,7 +50,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -65,7 +65,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_inter.phpt b/ext/session/tests/rfc1867_inter.phpt
@@ -60,7 +60,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -75,7 +75,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_no_name.phpt b/ext/session/tests/rfc1867_no_name.phpt
@@ -50,7 +50,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -65,7 +65,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_sid_cookie.phpt b/ext/session/tests/rfc1867_sid_cookie.phpt
@@ -56,7 +56,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -71,7 +71,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_sid_get.phpt b/ext/session/tests/rfc1867_sid_get.phpt
@@ -54,7 +54,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -69,7 +69,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_sid_get_2.phpt b/ext/session/tests/rfc1867_sid_get_2.phpt
@@ -56,7 +56,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -71,7 +71,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_sid_invalid.phpt b/ext/session/tests/rfc1867_sid_invalid.phpt
@@ -68,7 +68,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -83,7 +83,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_sid_only_cookie.phpt b/ext/session/tests/rfc1867_sid_only_cookie.phpt
@@ -56,7 +56,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -71,7 +71,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_sid_only_cookie_2.phpt b/ext/session/tests/rfc1867_sid_only_cookie_2.phpt
@@ -53,7 +53,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -68,7 +68,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/ext/session/tests/rfc1867_sid_post.phpt b/ext/session/tests/rfc1867_sid_post.phpt
@@ -52,7 +52,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(0) ""
@@ -67,7 +67,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
diff --git a/main/rfc1867.c b/main/rfc1867.c
@@ -55,7 +55,7 @@ PHPAPI int (*php_rfc1867_callback)(unsigned int event, void *event_data, void **
 static void safe_php_register_variable(char *var, char *strval, size_t val_len, zval *track_vars_array, bool override_protection);
 
 /* The longest property name we use in an uploaded file array */
-#define MAX_SIZE_OF_INDEX sizeof("[tmp_name]")
+#define MAX_SIZE_OF_INDEX sizeof("[full_path]")
 
 /* The longest anonymous name */
 #define MAX_SIZE_ANONNAME 33
@@ -1147,11 +1147,11 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
 			/* Add full path of supplied file for folder uploads via 
 			 * <input type="file" name="files" multiple webkitdirectory>
 			 */
-			/* Add $foo[fullname] */
+			/* Add $foo[full_path] */
 			if (is_arr_upload) {
-				snprintf(lbuf, llen, "%s[fullpath][%s]", abuf, array_index);
+				snprintf(lbuf, llen, "%s[full_path][%s]", abuf, array_index);
 			} else {
-				snprintf(lbuf, llen, "%s[fullpath]", param);
+				snprintf(lbuf, llen, "%s[full_path]", param);
 			}
 			register_http_post_files_variable(lbuf, filename, &PG(http_globals)[TRACK_VARS_FILES], 0);
 			efree(filename);
diff --git a/sapi/cli/tests/php_cli_server_005.phpt b/sapi/cli/tests/php_cli_server_005.phpt
@@ -55,7 +55,7 @@ array(1) {
   array(6) {
     ["name"]=>
     string(12) "laruence.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(12) "laruence.txt"
     ["type"]=>
     string(10) "text/plain"
diff --git a/tests/basic/021.phpt b/tests/basic/021.phpt
@@ -27,7 +27,7 @@ array(1) {
   array(6) {
     ["name"]=>
     string(12) "bug37276.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(12) "bug37276.txt"
     ["type"]=>
     string(10) "text/plain"
diff --git a/tests/basic/029.phpt b/tests/basic/029.phpt
@@ -35,7 +35,7 @@ array(1) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(10) "text/plain"
diff --git a/tests/basic/bug55500.phpt b/tests/basic/bug55500.phpt
@@ -42,7 +42,7 @@ array(1) {
       [0]=>
       string(9) "file1.txt"
     }
-    ["fullpath"]=>
+    ["full_path"]=>
     array(1) {
       [0]=>
       string(9) "file1.txt"
diff --git a/tests/basic/rfc1867_anonymous_upload.phpt b/tests/basic/rfc1867_anonymous_upload.phpt
@@ -28,7 +28,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(16) "text/plain-file1"
@@ -43,7 +43,7 @@ array(2) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(16) "text/plain-file2"
diff --git a/tests/basic/rfc1867_array_upload.phpt b/tests/basic/rfc1867_array_upload.phpt
@@ -40,7 +40,7 @@ array(1) {
       [3]=>
       string(9) "file3.txt"
     }
-    ["fullpath"]=>
+    ["full_path"]=>
     array(3) {
       [0]=>
       string(9) "file1.txt"
diff --git a/tests/basic/rfc1867_empty_upload.phpt b/tests/basic/rfc1867_empty_upload.phpt
@@ -43,7 +43,7 @@ array(3) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(16) "text/plain-file1"
@@ -58,7 +58,7 @@ array(3) {
   array(6) {
     ["name"]=>
     string(0) ""
-    ["fullpath"]=>
+    ["full_path"]=>
     string(0) ""
     ["type"]=>
     string(0) ""
@@ -73,7 +73,7 @@ array(3) {
   array(6) {
     ["name"]=>
     string(9) "file3.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file3.txt"
     ["type"]=>
     string(16) "text/plain-file3"
diff --git a/tests/basic/rfc1867_max_file_size.phpt b/tests/basic/rfc1867_max_file_size.phpt
@@ -43,7 +43,7 @@ array(3) {
   array(6) {
     ["name"]=>
     string(9) "file1.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file1.txt"
     ["type"]=>
     string(16) "text/plain-file1"
@@ -58,7 +58,7 @@ array(3) {
   array(6) {
     ["name"]=>
     string(9) "file2.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(9) "file2.txt"
     ["type"]=>
     string(0) ""
@@ -73,7 +73,7 @@ array(3) {
   array(6) {
     ["name"]=>
     string(9) "file3.txt"
-    ["fullpath"]=>
+    ["full_path"]=>
     string(20) "C:\foo\bar/file3.txt"
     ["type"]=>
     string(16) "text/plain-file3"
diff --git a/tests/basic/rfc1867_max_file_uploads_empty_files.phpt b/tests/basic/rfc1867_max_file_uploads_empty_files.phpt
diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt
diff --git a/tests/basic/rfc1867_post_max_filesize.phpt b/tests/basic/rfc1867_post_max_filesize.phpt
