Ticket #16402: 16402.2.diff

wp-includes/class-wp-http-ixr-client.php

@@ -7 +7 @@
  *
  */
 class WP_HTTP_IXR_Client extends IXR_Client {
-        function WP_HTTP_IXR_Client($server, $path = false, $port = 80, $timeout = 15) {
+        function WP_HTTP_IXR_Client($server, $path = false, $port = false, $timeout = 15) {
                 if ( ! $path ) {
                         // Assume we have been given a URL instead
                         $bits = parse_url($server);
                         $this->scheme = $bits['scheme'];
                         $this->server = $bits['host'];
-                        $this->port = isset($bits['port']) ? $bits['port'] : 80;
+                        $this->port = isset($bits['port']) ? $bits['port'] : $port;
                         $this->path = !empty($bits['path']) ? $bits['path'] : '/';
 
                         // Make absolutely sure we have a path
@@ -35 +35 @@
                 $request = new IXR_Request($method, $args);
                 $xml = $request->getXml();
 
-                $url = $this->scheme . '://' . $this->server . ':' . $this->port . $this->path;
+                $port = $this->port ? ":$this->port" : '';
+                $url = $this->scheme . '://' . $this->server . $port . $this->path;
                 $args = array(
                         'headers'    => array('Content-Type' => 'text/xml'),
                         'user-agent' => $this->useragent,