From a5e73d3b9bcd3b7e9c40deafca42cd23f10532dc Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 16 May 2009 05:15:21 +0000
Subject: [PATCH] Fix feed autodiscovery. Props peaceablewhale. fixes #9810

git-svn-id: http://svn.automattic.com/wordpress/trunk@11358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/feed-rss.php           | 2 +-
 wp-includes/feed-rss2-comments.php | 2 +-
 wp-includes/feed-rss2.php          | 2 +-
 wp-includes/feed.php               | 7 ++++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/wp-includes/feed-rss.php b/wp-includes/feed-rss.php
index 51c15ec717..e5c2fe830a 100644
--- a/wp-includes/feed-rss.php
+++ b/wp-includes/feed-rss.php
@@ -5,7 +5,7 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
diff --git a/wp-includes/feed-rss2-comments.php b/wp-includes/feed-rss2-comments.php
index d5ea2cc5ea..8232a0f174 100644
--- a/wp-includes/feed-rss2-comments.php
+++ b/wp-includes/feed-rss2-comments.php
@@ -5,7 +5,7 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true);
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
 ?>
diff --git a/wp-includes/feed-rss2.php b/wp-includes/feed-rss2.php
index 01aa66616c..c4299cbea8 100644
--- a/wp-includes/feed-rss2.php
+++ b/wp-includes/feed-rss2.php
@@ -5,7 +5,7 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index bc094d524c..74cb6b4a43 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -523,10 +523,11 @@ function feed_content_type( $type = '' ) {
 		$type = get_default_feed();
 
 	$types = array(
-		'rss'  => 'text/xml',
-		'rss2' => 'text/xml',
+		'rss'  => 'application/rss+xml',
+		'rss2' => 'application/rss+xml',
+		'rss-http'  => 'text/xml',
 		'atom' => 'application/atom+xml',
-		'rdf'  => 'application/rdf+xml',
+		'rdf'  => 'application/rdf+xml'
 	);
 
 	$content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';