Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php	(revision 15270)
+++ wp-includes/pluggable.php	(working copy)
@@ -871,24 +871,39 @@
  * @param int $status Status code to use
  * @return bool False if $location is not set
  */
-function wp_redirect($location, $status = 302) {
+function wp_redirect( $location, $status = 302 ) {
 	global $is_IIS;
 
-	$location = apply_filters('wp_redirect', $location, $status);
-	$status = apply_filters('wp_redirect_status', $status, $location);
+	$location = apply_filters( 'wp_redirect', $location, $status );
+	$status   = apply_filters( 'wp_redirect_status', $status, $location );
 
 	if ( !$location ) // allows the wp_redirect filter to cancel a redirect
 		return false;
 
-	$location = wp_sanitize_redirect($location);
+	$location = wp_sanitize_redirect( $location );
 
 	if ( $is_IIS ) {
-		header("Refresh: 0;url=$location");
+		header( "Refresh: 0;url=$location" );
 	} else {
 		if ( php_sapi_name() != 'cgi-fcgi' )
 			status_header($status); // This causes problems on IIS and some FastCGI setups
-		header("Location: $location", true, $status);
+		header( "Location: $location", true, $status );
 	}
+
+	$status = (int) $status;
+	$method = $_SERVER['REQUEST_METHOD'];
+	$html   = 'HEAD' !== $method && (301 === $status || 302 === $status || 303 === $status || 307 === $status);
+	if ( $html ) {
+		
+?>
+<HTML><HEAD><meta http-equiv="content-type" content="text/html;charset=utf-8">
+<TITLE><?php echo $status; ?> Moved</TITLE></HEAD><BODY>
+<H1><?php echo $status; ?> Moved</H1>
+The document has moved
+<A HREF="<?php echo esc_attr( $location ); ?>">here</A>.
+</BODY></HTML>
+<?php
+	}
 }
 endif;
 
