diff --git a/wp-admin/includes/htaccess.ms b/wp-admin/includes/htaccess.ms index 83e5d56168..1c13a1311c 100644 --- a/wp-admin/includes/htaccess.ms +++ b/wp-admin/includes/htaccess.ms @@ -4,7 +4,7 @@ RewriteBase BASE/ #uploaded files RewriteRule ^(.*/)?files/$ index.php [L] RewriteCond %{REQUEST_URI} !.*wp-content/plugins.* -RewriteRule ^(.*/)?files/(.*) wp-includes/blogs.php?file=$2 [L] +RewriteRule ^(.*/)?files/(.*) wp-includes/ms-files.php?file=$2 [L] # add a trailing slash to /wp-admin RewriteCond %{REQUEST_URI} ^.*/wp-admin$ diff --git a/wp-includes/blogs.php b/wp-includes/blogs.php deleted file mode 100644 index 2c7c49ff33..0000000000 --- a/wp-includes/blogs.php +++ /dev/null @@ -1,14 +0,0 @@ -cookie_domain); break; + case 'ms-files' : + /** + * Optional support for X-Sendfile header + * @since 3.0.0 + */ + if ( !defined( 'WPMU_SENDFILE' ) ) + define( 'WPMU_SENDFILE', false ); + /** + * Optional support for X-Accel-Redirect header + * @since 3.0.0 + */ + if ( !defined( 'WPMU_ACCEL_REDIRECT' ) ) + define( 'WPMU_ACCEL_REDIRECT', false ); + break; } } ?> \ No newline at end of file diff --git a/wp-content/blogs.php b/wp-includes/ms-files.php old mode 100755 new mode 100644 similarity index 59% rename from wp-content/blogs.php rename to wp-includes/ms-files.php index 62ade7afd2..c05c8eb82f --- a/wp-content/blogs.php +++ b/wp-includes/ms-files.php @@ -1,12 +1,22 @@ archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) { status_header( 404 ); - die('404 — File not found.'); + die( '404 — File not found.' ); } if ( !function_exists('wp_check_filetype') ) : @@ -53,7 +63,7 @@ function wp_check_filetype($filename, $mimes = null) { $type = false; $ext = false; - foreach ( (array)$mimes as $ext_preg => $mime_match ) { + foreach ( (array) $mimes as $ext_preg => $mime_match ) { $ext_preg = '!\.(' . $ext_preg . ')$!i'; if ( preg_match($ext_preg, $filename, $ext_matches) ) { $type = $mime_match; @@ -69,62 +79,59 @@ endif; $file = BLOGUPLOADDIR . str_replace( '..', '', $_GET[ 'file' ] ); if ( !is_file( $file ) ) { status_header( 404 ); - die('404 — File not found.'); + die( '404 — File not found.' ); } $mime = wp_check_filetype( $_SERVER[ 'REQUEST_URI' ] ); -if( $mime[ 'type' ] === false && function_exists( 'mime_content_type' ) ) - $mime[ 'type' ] = mime_content_type( $file ); +if( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) ) + $mime[ 'type' ] = mime_content_type( $file ); -if( $mime[ 'type' ] != false ) { +if( $mime[ 'type' ] ) $mimetype = $mime[ 'type' ]; -} else { - $ext = substr( $_SERVER[ 'REQUEST_URI' ], strrpos( $_SERVER[ 'REQUEST_URI' ], '.' ) + 1 ); - $mimetype = "image/$ext"; -} -@header( 'Content-type: ' . $mimetype ); // always send this +else + $mimetype = 'image/' . substr( $_SERVER[ 'REQUEST_URI' ], strrpos( $_SERVER[ 'REQUEST_URI' ], '.' ) + 1 ); + +header( 'Content-type: ' . $mimetype ); // always send this if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) - @header( 'Content-Length: ' . filesize( $file ) ); + header( 'Content-Length: ' . filesize( $file ) ); // Optional support for X-Sendfile and X-Accel-Redirect -if ( defined('WPMU_ACCEL_REDIRECT') && WPMU_ACCEL_REDIRECT ) { - @header( 'X-Accel-Redirect: ' . str_replace( WP_CONTENT_DIR, '', $file ) ); +if ( WPMU_ACCEL_REDIRECT ) { + header( 'X-Accel-Redirect: ' . str_replace( WP_CONTENT_DIR, '', $file ) ); exit; -} elseif ( defined('WPMU_SENDFILE') && WPMU_SENDFILE ) { - @header( 'X-Sendfile: ' . $file ); +} elseif ( WPMU_SENDFILE ) { + header( 'X-Sendfile: ' . $file ); exit; } -$last_modified = gmdate('D, d M Y H:i:s', filemtime( $file )); -$etag = '"' . md5($last_modified) . '"'; -@header( "Last-Modified: $last_modified GMT" ); -@header( 'ETag: ' . $etag ); -@header( 'Expires: ' . gmdate('D, d M Y H:i:s', time() + 100000000) . ' GMT' ); +$last_modified = gmdate( 'D, d M Y H:i:s', filemtime( $file ) ); +$etag = '"' . md5( $last_modified ) . '"'; +header( "Last-Modified: $last_modified GMT" ); +header( 'ETag: ' . $etag ); +header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' ); // Support for Conditional GET -if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) - $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']); -else - $client_etag = false; +$client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false; -if( !isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) +if( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) $_SERVER['HTTP_IF_MODIFIED_SINCE'] = false; -$client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE']); + +$client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ); // If string is empty, return 0. If not, attempt to parse into a timestamp -$client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0; +$client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0; // Make a timestamp for our most recent modification... $modified_timestamp = strtotime($last_modified); -if ( ($client_last_modified && $client_etag) ? - (($client_modified_timestamp >= $modified_timestamp) && ($client_etag == $etag)) : - (($client_modified_timestamp >= $modified_timestamp) || ($client_etag == $etag)) ) { +if ( ( $client_last_modified && $client_etag ) + ? ( ( $client_modified_timestamp >= $modified_timestamp) && ( $client_etag == $etag ) ) + : ( ( $client_modified_timestamp >= $modified_timestamp) || ( $client_etag == $etag ) ) + ) { status_header( 304 ); exit; } // If we made it this far, just serve the file - readfile( $file ); ?>