From 9c0a5cd498acbeb0b06d116b33bca788720e73cd Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 17 Apr 2011 07:48:34 +0000
Subject: [PATCH] Don't do SSL discovery for every RSD request. APP endpoint
 already respects the SSLness of the site. Fixes #15960.

git-svn-id: http://svn.automattic.com/wordpress/trunk@17642 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/default-filters.php |  3 ---
 wp-includes/functions.php       | 16 ----------------
 xmlrpc.php                      |  2 +-
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 4822e2ead0..b756920d0a 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -191,9 +191,6 @@ add_filter( 'pings_open',           '_close_comments_for_old_post', 10, 2 );
 add_filter( 'editable_slug',        'urldecode'                           );
 add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object'    );
 
-// Atom SSL support
-add_filter( 'atom_service_url','atom_service_url_filter' );
-
 // Actions
 add_action( 'wp_head',             'wp_enqueue_scripts',            1     );
 add_action( 'wp_head',             'feed_links',                    2     );
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index b61259cfce..af0d556252 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -3322,22 +3322,6 @@ function url_is_accessable_via_ssl($url)
 	return false;
 }
 
-/**
- * Secure URL, if available or the given URL.
- *
- * @since 2.5.0
- *
- * @param string $url Complete URL path with transport.
- * @return string Secure or regular URL path.
- */
-function atom_service_url_filter($url)
-{
-	if ( url_is_accessable_via_ssl($url) )
-		return preg_replace( '/^http:\/\//', 'https://',  $url );
-	else
-		return $url;
-}
-
 /**
  * Marks a function as deprecated and informs when it has been used.
  *
diff --git a/xmlrpc.php b/xmlrpc.php
index 8517177642..d7f54fe99a 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -42,7 +42,7 @@ header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
       <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
       <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
       <api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
-      <api name="Atom" blogID="" preferred="false" apiLink="<?php echo apply_filters('atom_service_url', site_url('wp-app.php/service', 'rpc') ) ?>" />
+      <api name="Atom" blogID="" preferred="false" apiLink="<?php echo site_url('wp-app.php/service', 'rpc') ?>" />
     </apis>
   </service>
 </rsd>