Make WordPress Core

Ticket #33529: changeset_123058.diff

File changeset_123058.diff, 978 bytes (added by beaucollins, 9 years ago)
  • trunk/wp-includes/class-IXR.php

     
    709709            $bits = parse_url($server);
    710710            $this->server = $bits['host'];
    711             $this->port = isset($bits['port']) ? $bits['port'] : 80;
     711
     712            // If the port is in the url, use that port
     713            // If no port in the URL use the default port for the given scheme (http vs https)
     714            // If no scheme and no port, just use port 80
     715            if (isset($bits['port'])) {
     716              $this->port = $bits['port'];
     717            } else if (isset($bits['scheme'])) {
     718              $this->port = $bits['scheme'] == 'https' ? 443 : 80;
     719            } else {
     720              $this->port = 80;
     721            }
     722
    712723            $this->path = isset($bits['path']) ? $bits['path'] : '/';
    713724