<!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" />
<title>[27552] trunk: Allow query strings for servers in IXR_Client and WP_HTTP_IXR_Client.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27552">27552</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-15 05:00:27 +0000 (Sat, 15 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Allow query strings for servers in IXR_Client and WP_HTTP_IXR_Client.

props cfinke.
fixes <a href="http://core.trac.wordpress.org/ticket/26947">#26947</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclassIXRphp">trunk/src/wp-includes/class-IXR.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpixrclientphp">trunk/src/wp-includes/class-wp-http-ixr-client.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsxmlrpcclientphp">trunk/tests/phpunit/tests/xmlrpc/client.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclassIXRphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-IXR.php (27551 => 27552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-IXR.php      2014-03-15 04:46:53 UTC (rev 27551)
+++ trunk/src/wp-includes/class-IXR.php 2014-03-15 05:00:27 UTC (rev 27552)
</span><span class="lines">@@ -629,6 +629,10 @@
</span><span class="cx">             if (!$this->path) {
</span><span class="cx">                 $this->path = '/';
</span><span class="cx">             }
</span><ins>+
+            if ( ! empty( $bits['query'] ) ) {
+                $this->path .= '?' . $bits['query'];
+            }
</ins><span class="cx">         } else {
</span><span class="cx">             $this->server = $server;
</span><span class="cx">             $this->path = $path;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpixrclientphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-http-ixr-client.php (27551 => 27552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-http-ixr-client.php       2014-03-15 04:46:53 UTC (rev 27551)
+++ trunk/src/wp-includes/class-wp-http-ixr-client.php  2014-03-15 05:00:27 UTC (rev 27552)
</span><span class="lines">@@ -18,8 +18,13 @@
</span><span class="cx">                  $this->path = !empty($bits['path']) ? $bits['path'] : '/';
</span><span class="cx"> 
</span><span class="cx">                  // Make absolutely sure we have a path
</span><del>-                       if ( ! $this->path )
</del><ins>+                        if ( ! $this->path ) {
</ins><span class="cx">                           $this->path = '/';
</span><ins>+                       }
+                               
+                       if ( ! empty( $bits['query'] ) ) {
+                               $this->path .= '?' . $bits['query'];
+                       }
</ins><span class="cx">           } else {
</span><span class="cx">                  $this->scheme = 'http';
</span><span class="cx">                  $this->server = $server;
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcclientphp"></a>
<div class="addfile"><h4>Added: trunk/tests/phpunit/tests/xmlrpc/client.php (0 => 27552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/xmlrpc/client.php                              (rev 0)
+++ trunk/tests/phpunit/tests/xmlrpc/client.php 2014-03-15 05:00:27 UTC (rev 27552)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<?php
+require_once ABSPATH . WPINC . '/class-IXR.php';
+require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+
+/**
+ * @group xmlrpc
+ */
+class Tests_XMLRPC_Client extends WP_XMLRPC_UnitTestCase {
+
+       /**
+        * @ticket 26947
+        */
+       function test_ixr_client_allows_query_strings() {
+               $client = new IXR_Client( 'http://example.com/server.php?this-is-needed=true#not-this' );
+               $this->assertEquals( 'example.com', $client->server );
+               $this->assertEquals( 80, $client->port );
+               $this->assertEquals( '/server.php?this-is-needed=true', $client->path );
+       }
+
+       /**
+        * @ticket 26947
+        */
+       function test_wp_ixr_client_allows_query_strings() {
+               $client = new WP_HTTP_IXR_Client( 'http://example.com/server.php?this-is-needed=true#not-this' );
+               $this->assertEquals( 'example.com', $client->server );
+               $this->assertFalse( $client->port );
+               $this->assertEquals( '/server.php?this-is-needed=true', $client->path );
+       }
+}
+
</ins></span></pre>
</div>
</div>

</body>
</html>