Changeset 32712

Timestamp:

06/09/2015 03:54:49 AM (10 years ago)

Author:

dd32

Message:

WP_HTTP: ensure that the temporary file is created within the temporary directly when stream is specified without a filename parameter.
Fixes #32549

Location:

trunk

Files:

• src/wp-includes/class-http.php (modified) (1 diff)
• tests/phpunit/tests/http/base.php (modified) (2 diffs)

trunk/src/wp-includes/class-http.php

@@ -214 +214 @@
          */
         if ( $r['stream']  && empty( $r['filename'] ) ) {
-            $r['filename'] = wp_unique_filename( get_temp_dir(), basename( $url ) );
+            $r['filename'] = get_temp_dir() . wp_unique_filename( get_temp_dir(), basename( $url ) );
         }
 

trunk/tests/phpunit/tests/http/base.php

@@ -189 +189 @@
             $filesize = filesize( $res['filename'] );
             unlink( $res['filename'] );
-        }       
+        }
 
         $this->assertFalse( is_wp_error( $res ) );
@@ -195 +195 @@
         $this->assertEquals( $size, $res['headers']['content-length'] ); // Check the headers are returned (and the size is the same..)
         $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters
+        $this->assertStringStartsWith( get_temp_dir(), $res['filename'] ); // Check it's saving within the temp dir
     }