Changeset 17642

Timestamp:

04/17/2011 07:48:34 AM (14 years ago)

Author:

westi

Message:

Don't do SSL discovery for every RSD request. APP endpoint already respects the SSLness of the site. Fixes #15960.

Location:

trunk

Files:

• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• xmlrpc.php (modified) (1 diff)

trunk/wp-includes/default-filters.php

@@ -191 +191 @@
 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

trunk/wp-includes/functions.php

@@ -3324 +3324 @@
 
 /**
- * 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.
  *

trunk/xmlrpc.php

@@ -43 +43 @@
       <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>