<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17642] trunk: Don't do SSL discovery for every RSD request.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17642">17642</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2011-04-17 07:48:34 +0000 (Sun, 17 Apr 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Don't do SSL discovery for every RSD request. APP endpoint already respects the SSLness of the site. Fixes <a href="http://trac.wordpress.org/ticket/15960">#15960</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (17641 => 17642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php        2011-04-17 07:39:41 UTC (rev 17641)
+++ trunk/wp-includes/default-filters.php        2011-04-17 07:48:34 UTC (rev 17642)
</span><span class="lines">@@ -191,9 +191,6 @@
</span><span class="cx"> add_filter( 'editable_slug',        'urldecode'                           );
</span><span class="cx"> add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object'    );
</span><span class="cx"> 
</span><del>-// Atom SSL support
-add_filter( 'atom_service_url','atom_service_url_filter' );
-
</del><span class="cx"> // Actions
</span><span class="cx"> add_action( 'wp_head',             'wp_enqueue_scripts',            1     );
</span><span class="cx"> add_action( 'wp_head',             'feed_links',                    2     );
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (17641 => 17642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php        2011-04-17 07:39:41 UTC (rev 17641)
+++ trunk/wp-includes/functions.php        2011-04-17 07:48:34 UTC (rev 17642)
</span><span class="lines">@@ -3323,22 +3323,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * 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;
-}
-
-/**
</del><span class="cx">  * Marks a function as deprecated and informs when it has been used.
</span><span class="cx">  *
</span><span class="cx">  * There is a hook deprecated_function_run that will be called that can be used
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (17641 => 17642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php        2011-04-17 07:39:41 UTC (rev 17641)
+++ trunk/xmlrpc.php        2011-04-17 07:48:34 UTC (rev 17642)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">       &lt;api name=&quot;Movable Type&quot; blogID=&quot;1&quot; preferred=&quot;false&quot; apiLink=&quot;&lt;?php echo site_url('xmlrpc.php', 'rpc') ?&gt;&quot; /&gt;
</span><span class="cx">       &lt;api name=&quot;MetaWeblog&quot; blogID=&quot;1&quot; preferred=&quot;false&quot; apiLink=&quot;&lt;?php echo site_url('xmlrpc.php', 'rpc') ?&gt;&quot; /&gt;
</span><span class="cx">       &lt;api name=&quot;Blogger&quot; blogID=&quot;1&quot; preferred=&quot;false&quot; apiLink=&quot;&lt;?php echo site_url('xmlrpc.php', 'rpc') ?&gt;&quot; /&gt;
</span><del>-      &lt;api name=&quot;Atom&quot; blogID=&quot;&quot; preferred=&quot;false&quot; apiLink=&quot;&lt;?php echo apply_filters('atom_service_url', site_url('wp-app.php/service', 'rpc') ) ?&gt;&quot; /&gt;
</del><ins>+      &lt;api name=&quot;Atom&quot; blogID=&quot;&quot; preferred=&quot;false&quot; apiLink=&quot;&lt;?php echo site_url('wp-app.php/service', 'rpc') ?&gt;&quot; /&gt;
</ins><span class="cx">     &lt;/apis&gt;
</span><span class="cx">   &lt;/service&gt;
</span><span class="cx"> &lt;/rsd&gt;
</span></span></pre>
</div>
</div>

</body>
</html>