Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
westi 2011-04-17 07:48:34 +00:00
parent 10084a7fb1
commit 9c0a5cd498
3 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/default-filters.php
View File

@ -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 );

16
wp-includes/functions.php
View File

@ -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.
*

2
xmlrpc.php
View File

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