Feeds: Revert [36230] which removed the `rss-http` feed content type. Removing this means that any feeds which are using this feed content type are now being served as `application/octet-stream` instead of `text/xml`.

See #36620

Merges [37282] to the 4.5 branch.

Built from https://develop.svn.wordpress.org/branches/4.5@37284


git-svn-id: http://core.svn.wordpress.org/branches/4.5@37250 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/feed.php

@@ -630,10 +630,11 @@ function feed_content_type( $type = '' ) {
 		$type = get_default_feed();
 
 	$types = array(
-		'rss'  => 'application/rss+xml',
-		'rss2' => 'application/rss+xml',
-		'atom' => 'application/atom+xml',
-		'rdf'  => 'application/rdf+xml'
+		'rss'      => 'application/rss+xml',
+		'rss2'     => 'application/rss+xml',
+		'rss-http' => 'text/xml',
+		'atom'     => 'application/atom+xml',
+		'rdf'      => 'application/rdf+xml'
 	);
 
 	$content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5.1-alpha-37275';
+$wp_version = '4.5.1-alpha-37284';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.