Changeset 11154

Timestamp:

05/01/2009 11:53:38 PM (17 years ago)

Author:

ryan

Message:

Send valid host when using WP_Http_Fsockopen over SSL. Props mdawaffe. fixes #9699

File:

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

trunk/wp-includes/http.php

@@ -605 +605 @@
                 $arrURL = parse_url($url);
 
+                $fsockopen_host = $arrURL['host'];
+
                 $secure_transport = false;
 
-                if ( ! isset($arrURL['port']) ) {
-                        if ( ($arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https') && extension_loaded('openssl') ) {
-                                $arrURL['host'] = 'ssl://' . $arrURL['host'];
+                if ( ! isset( $arrURL['port'] ) ) {
+                        if ( ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' ) && extension_loaded('openssl') ) {
+                                $fsockopen_host = "ssl://$fsockopen_host";
                                 $arrURL['port'] = 443;
                                 $secure_transport = true;
@@ -628 +630 @@
                 if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) ) {
                         if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-                                $handle = @fsockopen($proxy->host(), $proxy->port(), $iError, $strError, $r['timeout'] );
+                                $handle = @fsockopen( $proxy->host(), $proxy->port(), $iError, $strError, $r['timeout'] );
                         else
-                                $handle = @fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, $r['timeout'] );
+                                $handle = @fsockopen( $fsockopen_host, $arrURL['port'], $iError, $strError, $r['timeout'] );
                 } else {
                         if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-                                $handle = fsockopen($proxy->host(), $proxy->port(), $iError, $strError, $r['timeout'] );
+                                $handle = fsockopen( $proxy->host(), $proxy->port(), $iError, $strError, $r['timeout'] );
                         else
-                                $handle = fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, $r['timeout'] );
+                                $handle = fsockopen( $fsockopen_host, $arrURL['port'], $iError, $strError, $r['timeout'] );
                 }
 
@@ -2002 +2004 @@
  */
 function wp_remote_retrieve_response_code(&$response) {
-        if ( is_wp_error($response) ||! isset($response['response']) || ! is_array($response['response']))
+        if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
                 return '';