Changeset 29852

Timestamp:

10/08/2014 06:14:58 AM (12 years ago)

Author:

dd32

Message:

When making a HTTP request to a non-standard port, include the port in the Host header for the Streams HTTP transport. This bring parity to the cURL transport and respects the HTTP RFC.
Props kamelkev for the initial patch; Fixes #28982

File:

• trunk/src/wp-includes/class-http.php (modified) (1 diff)

trunk/src/wp-includes/class-http.php

@@ -971 +971 @@
                 $strHeaders = strtoupper($r['method']) . ' ' . $requestPath . ' HTTP/' . $r['httpversion'] . "\r\n";
 
-                if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
+                $include_port_in_host_header = (
+                        ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) ||
+                        ( 'http'  == $arrURL['scheme'] && 80  != $arrURL['port'] ) ||
+                        ( 'https' == $arrURL['scheme'] && 443 != $arrURL['port'] )
+                );
+
+                if ( $include_port_in_host_header ) {
                         $strHeaders .= 'Host: ' . $arrURL['host'] . ':' . $arrURL['port'] . "\r\n";
-                else
+                } else {
                         $strHeaders .= 'Host: ' . $arrURL['host'] . "\r\n";
+                }
 
                 if ( isset($r['user-agent']) )