Changeset 17811

Timestamp:

05/05/2011 06:57:29 PM (14 years ago)

Author:

ryan

Message:

Properly handle https in ixr client. Props mdawaffe. fixes #16402

File:

• trunk/wp-includes/class-wp-http-ixr-client.php (modified) (3 diffs)

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

@@ -9 +9 @@
 class WP_HTTP_IXR_Client extends IXR_Client {
 
-    function __construct($server, $path = false, $port = 80, $timeout = 15) {
+    function __construct($server, $path = false, $port = false, $timeout = 15) {
         if ( ! $path ) {
             // Assume we have been given a URL instead
@@ -15 +15 @@
             $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'] : '/';
 
@@ -37 +37 @@
         $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'),