WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@405 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 12 insertions, 1 deletions

diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index cd126d1..b9a046b 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -927,9 +927,13 @@ function do_enclose( $content, $post_ID ) {
 	endforeach;
 }
 
-function wp_get_http_headers( $url ) {
+function wp_get_http_headers( $url, $red = 1 ) {
 	global $wp_version;
 	@set_time_limit( 60 );
+
+	if ( $red > 5 )
+	   return false;
+
 	$parts = parse_url( $url );
 	$file = $parts['path'] . ($parts['query'] ? '?'.$parts['query'] : '');
 	$host = $parts['host'];
@@ -954,6 +958,13 @@ function wp_get_http_headers( $url ) {
 		$headers["$key"] = $matches[2][$i];
 	}
 
+    $code = preg_replace('/.*?(\d{3}).*/i', '$1', $response);
+    
+    $headers['status_code'] = $code;
+    
+    if ( '302' == $code || '301' == $code )
+        return wp_get_http_headers( $url, ++$red );
+
 	preg_match('/.*([0-9]{3}).*/', $response, $return);
 	$headers['response'] = $return[1]; // HTTP response code eg 204, 200, 404
 	return $headers;