Use port 443 for SSL connections

igorw · igorw · commit cc64be04a833 · 2013-01-15T01:45:58.000+01:00
diff --git a/RequestData.php b/RequestData.php
@@ -19,7 +19,7 @@ public function __construct($method, $url, array $headers = array())
 
     private function mergeDefaultheaders(array $headers)
     {
-        $port = (80 === $this->getPort()) ? '' : ":{$this->getPort()}";
+        $port = ($this->getDefaultPort() === $this->getPort()) ? '' : ":{$this->getPort()}";
         $connectionHeaders = ('1.1' === $this->protocolVersion) ? array('Connection' => 'close') : array();
 
         return array_merge(
@@ -44,7 +44,12 @@ public function getHost()
 
     public function getPort()
     {
-        return (int) parse_url($this->url, PHP_URL_PORT) ?: 80;
+        return (int) parse_url($this->url, PHP_URL_PORT) ?: $this->getDefaultPort();
+    }
+
+    public function getDefaultPort()
+    {
+        return ('https' === $this->getScheme()) ? 443 : 80;
     }
 
     public function getPath()

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function __construct($method, $url, array $headers = array())`
`19`	`19`
`20`	`20`	`private function mergeDefaultheaders(array $headers)`
`21`	`21`	`{`
`22`		`- $port = (80 === $this->getPort()) ? '' : ":{$this->getPort()}";`
	`22`	`+ $port = ($this->getDefaultPort() === $this->getPort()) ? '' : ":{$this->getPort()}";`
`23`	`23`	`$connectionHeaders = ('1.1' === $this->protocolVersion) ? array('Connection' => 'close') : array();`
`24`	`24`
`25`	`25`	`return array_merge(`
`@@ -44,7 +44,12 @@ public function getHost()`
`44`	`44`
`45`	`45`	`public function getPort()`
`46`	`46`	`{`
`47`		`- return (int) parse_url($this->url, PHP_URL_PORT) ?: 80;`
	`47`	`+ return (int) parse_url($this->url, PHP_URL_PORT) ?: $this->getDefaultPort();`
	`48`	`+ }`
	`49`	`+`
	`50`	`+ public function getDefaultPort()`
	`51`	`+ {`
	`52`	`+ return ('https' === $this->getScheme()) ? 443 : 80;`
`48`	`53`	`}`
`49`	`54`
`50`	`55`	`public function getPath()`