Changeset 37286

Timestamp:

04/21/2016 08:17:32 PM (9 years ago)

Author:

ocean90

Message:

Media: Don't cache the results of wp_mkdir_p() in a persistent cache.

To improve the performance of wp_upload_dir() the result of wp_mkdir_p() was stored in a persistent cache, introduced in [36565]. But this becomes an issue when WordPress is scaled horizontally. You may end up caching a value for a server where the directory doesn't exist which will prevent further uploads on other servers because of the persistent cache.
The fix is to use a non-persistent cache.

Merge of [37285] to the 4.5 branch.

Props azaozz, ocean90.
See #34359.
Fixes #36621.

Location:

branches/4.5

Files:

• . (modified) (1 prop)
• src/wp-includes/functions.php (modified) (3 diffs)

branches/4.5/src/wp-includes/functions.php

@@ -1855 +1855 @@
  */
 function wp_upload_dir( $time = null, $create_dir = true, $refresh_cache = false ) {
-    static $cache = array();
+    static $cache = array(), $tested_paths = array();
 
     $key = sprintf( '%d-%s', get_current_blog_id(), (string) $time );
@@ -1875 +1875 @@
     if ( $create_dir ) {
         $path = $uploads['path'];
-        $tested_paths = wp_cache_get( 'upload_dir_tested_paths' );
-
-        if ( ! is_array( $tested_paths ) ) {
-            $tested_paths = array();
-        }
-
-        if ( ! in_array( $path, $tested_paths, true ) ) {
+
+        if ( array_key_exists( $path, $tested_paths ) ) {
+            $uploads['error'] = $tested_paths[ $path ];
+        } else {
             if ( ! wp_mkdir_p( $path ) ) {
                 if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
@@ -1890 +1887 @@
 
                 $uploads['error'] = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), esc_html( $error_path ) );
-            } else {
-                $tested_paths[] = $path;
-                wp_cache_set( 'upload_dir_tested_paths', $tested_paths );
             }
+
+            $tested_paths[ $path ] = $uploads['error'];
         }
     }