From 3ec1d3bf9da8bee9f6a0ab0747cb117e7e1ecfbe Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sat, 9 May 2015 06:39:24 +0000
Subject: [PATCH] Serve RSS feeds with the proper mime-type:
 `application/rss+xml`. The reason for hacking around browsers by using
 `text/xml` appears to no longer be relevant.

Props @chriscct7.
Reverts [11334] and [11358]
Fixes #15110.

Built from https://develop.svn.wordpress.org/trunk@32468


git-svn-id: http://core.svn.wordpress.org/trunk@32438 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/version.php            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-includes/feed-rss.php b/wp-includes/feed-rss.php
index 1650434405..a355a8af40 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-http') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss') . '; 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 703fa87cfa..c8e8d498ea 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('rss-http') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss2') . '; 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 2390c2d957..c82fc63c56 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('rss-http') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4e4b76c9dc..34277c17a2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32467';
+$wp_version = '4.3-alpha-32468';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.