Wordpress 3.7
[autoinstalls/wordpress.git] / wp-includes / class-http.php
index 77ba4597dd4cc457bdfe54803a2730430ab51dcd..c75b47e230eb013807984a0f76c62cfc731cb79e 100644 (file)
 /**
  * WordPress HTTP Class for managing HTTP Transports and making HTTP requests.
  *
- * This class is called for the functionality of making HTTP requests and replaces Snoopy
- * functionality. There is no available functionality to add HTTP transport implementations, since
- * most of the HTTP transports are added and available for use.
- *
- * There are no properties, because none are needed and for performance reasons. Some of the
- * functions are static and while they do have some overhead over functions in PHP4, the purpose is
- * maintainability. When PHP5 is finally the requirement, it will be easy to add the static keyword
- * to the code. It is not as easy to convert a function to a method after enough code uses the old
- * way.
+ * This class is used to consistently make outgoing HTTP requests easy for developers
+ * while still being compatible with the many PHP configurations under which
+ * WordPress runs.
  *
  * Debugging includes several actions, which pass different variables for debugging the HTTP API.
  *
@@ -42,8 +36,7 @@ class WP_Http {
         * using http_build_query().
         *
         * The only URI that are supported in the HTTP Transport implementation are the HTTP and HTTPS
-        * protocols. HTTP and HTTPS are assumed so the server might not know how to handle the send
-        * headers. Other protocols are unsupported and most likely will fail.
+        * protocols.
         *
         * The defaults are 'method', 'timeout', 'redirection', 'httpversion', 'blocking' and
         * 'user-agent'.
@@ -55,24 +48,17 @@ class WP_Http {
         * accept setting that value.
         *
         * The 'httpversion' option is used to sent the HTTP version and accepted values are '1.0', and
-        * '1.1' and should be a string. Version 1.1 is not supported, because of chunk response. The
-        * 'user-agent' option is the user-agent and is used to replace the default user-agent, which is
-        * 'WordPress/WP_Version', where WP_Version is the value from $wp_version.
+        * '1.1' and should be a string. The 'user-agent' option is the user-agent and is used to
+        * replace the default user-agent, which is 'WordPress/WP_Version', where WP_Version is the
+        * value from $wp_version.
         *
-        * 'blocking' is the default, which is used to tell the transport, whether it should halt PHP
-        * while it performs the request or continue regardless. Actually, that isn't entirely correct.
-        * Blocking mode really just means whether the fread should just pull what it can whenever it
-        * gets bytes or if it should wait until it has enough in the buffer to read or finishes reading
-        * the entire content. It doesn't actually always mean that PHP will continue going after making
-        * the request.
+        * The 'blocking' parameter can be used to specify if the calling code requires the result of
+        * the HTTP request. If set to false, the request will be sent to the remote server, and
+        * processing returned to the calling code immediately, the caller will know if the request
+        * suceeded or failed, but will not receive any response from the remote server.
         *
         * @access public
         * @since 2.7.0
-        * @todo Refactor this code. The code in this method extends the scope of its original purpose
-        *              and should be refactored to allow for cleaner abstraction and reduce duplication of the
-        *              code. One suggestion is to create a class specifically for the arguments, however
-        *              preliminary refactoring to this affect has affect more than just the scope of the
-        *              arguments. Something to ponder at least.
         *
         * @param string $url URI resource.
         * @param str|array $args Optional. Override the defaults.
@@ -95,6 +81,7 @@ class WP_Http {
                        'compress' => false,
                        'decompress' => true,
                        'sslverify' => true,
+                       'sslcertificates' => ABSPATH . WPINC . '/certificates/ca-bundle.crt',
                        'stream' => false,
                        'filename' => null,
                        'limit_response_size' => null,
@@ -158,7 +145,7 @@ class WP_Http {
                        $r['headers'] = array();
 
                if ( ! is_array( $r['headers'] ) ) {
-                       $processedHeaders = WP_Http::processHeaders( $r['headers'] );
+                       $processedHeaders = WP_Http::processHeaders( $r['headers'], $url );
                        $r['headers'] = $processedHeaders['headers'];
                }
 
@@ -172,9 +159,16 @@ class WP_Http {
                        unset( $r['headers']['user-agent'] );
                }
 
+               if ( '1.1' == $r['httpversion'] && !isset( $r['headers']['connection'] ) ) {
+                       $r['headers']['connection'] = 'close';
+               }
+
                // Construct Cookie: header if any cookies are set
                WP_Http::buildCookieHeader( $r );
 
+               // Avoid issues where mbstring.func_overload is enabled
+               mbstring_binary_safe_encoding();
+
                if ( ! isset( $r['headers']['Accept-Encoding'] ) ) {
                        if ( $encoding = WP_Http_Encoding::accept_encoding( $url, $r ) )
                                $r['headers']['Accept-Encoding'] = $encoding;
@@ -195,7 +189,24 @@ class WP_Http {
                                $r['headers']['Content-Length'] = strlen( $r['body'] );
                }
 
-               return $this->_dispatch_request($url, $r);
+               $response = $this->_dispatch_request( $url, $r );
+
+               reset_mbstring_encoding();
+
+               if ( is_wp_error( $response ) )
+                       return $response;
+
+               // Append cookies that were used in this request to the response
+               if ( ! empty( $r['cookies'] ) ) {
+                       $cookies_set = wp_list_pluck( $response['cookies'], 'name' );
+                       foreach ( $r['cookies'] as $cookie ) {
+                               if ( ! in_array( $cookie->name, $cookies_set ) && $cookie->test( $url ) ) {
+                                       $response['cookies'][] = $cookie;
+                               }
+                       }
+               }
+
+               return $response;
        }
 
        /**
@@ -210,7 +221,7 @@ class WP_Http {
         * @return string|bool Class name for the first transport that claims to support the request. False if no transport claims to support the request.
         */
        public function _get_first_available_transport( $args, $url = null ) {
-               $request_order = array( 'curl', 'streams', 'fsockopen' );
+               $request_order = apply_filters( 'http_api_transports', array( 'curl', 'streams' ), $args, $url );
 
                // Loop over each transport on each HTTP request looking for one which will serve this request's needs
                foreach ( $request_order as $transport ) {
@@ -232,13 +243,7 @@ class WP_Http {
         * Tests each transport in order to find a transport which matches the request arguments.
         * Also caches the transport instance to be used later.
         *
-        * The order for blocking requests is cURL, Streams, and finally Fsockopen.
-        * The order for non-blocking requests is cURL, Streams and Fsockopen().
-        *
-        * There are currently issues with "localhost" not resolving correctly with DNS. This may cause
-        * an error "failed to open stream: A connection attempt failed because the connected party did
-        * not properly respond after a period of time, or established connection failed because [the]
-        * connected host has failed to respond."
+        * The order for requests is cURL, and then PHP Streams.
         *
         * @since 3.2.0
         * @access private
@@ -349,10 +354,11 @@ class WP_Http {
         * @since 2.7.0
         *
         * @param string|array $headers
+        * @param string $url The URL that was requested
         * @return array Processed string headers. If duplicate headers are encountered,
         *                                      Then a numbered array is returned as the value of that header-key.
         */
-       public static function processHeaders($headers) {
+       public static function processHeaders( $headers, $url = '' ) {
                // split headers, one per array element
                if ( is_string($headers) ) {
                        // tolerate line terminator: CRLF = LF (RFC 2616 19.3)
@@ -400,7 +406,7 @@ class WP_Http {
                                $newheaders[ $key ] = $value;
                        }
                        if ( 'set-cookie' == $key )
-                               $cookies[] = new WP_Http_Cookie( $value );
+                               $cookies[] = new WP_Http_Cookie( $value, $url );
                }
 
                return array('response' => $response, 'headers' => $newheaders, 'cookies' => $cookies);
@@ -409,9 +415,9 @@ class WP_Http {
        /**
         * Takes the arguments for a ::request() and checks for the cookie array.
         *
-        * If it's found, then it's assumed to contain WP_Http_Cookie objects, which are each parsed
-        * into strings and added to the Cookie: header (within the arguments array). Edits the array by
-        * reference.
+        * If it's found, then it upgrades any basic name => value pairs to WP_Http_Cookie instances,
+        * which are each parsed into strings and added to the Cookie: header (within the arguments array).
+        * Edits the array by reference.
         *
         * @access public
         * @version 2.8.0
@@ -421,10 +427,17 @@ class WP_Http {
         */
        public static function buildCookieHeader( &$r ) {
                if ( ! empty($r['cookies']) ) {
+                       // Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances
+                       foreach ( $r['cookies'] as $name => $value ) {
+                               if ( ! is_object( $value ) )
+                                       $r['cookies'][ $name ] = new WP_HTTP_Cookie( array( 'name' => $name, 'value' => $value ) );
+                       }
+
                        $cookies_header = '';
                        foreach ( (array) $r['cookies'] as $cookie ) {
                                $cookies_header .= $cookie->getHeaderValue() . '; ';
                        }
+
                        $cookies_header = substr( $cookies_header, 0, -2 );
                        $r['headers']['cookie'] = $cookies_header;
                }
@@ -433,12 +446,10 @@ class WP_Http {
        /**
         * Decodes chunk transfer-encoding, based off the HTTP 1.1 specification.
         *
-        * Based off the HTTP http_encoding_dechunk function. Does not support UTF-8. Does not support
-        * returning footer headers. Shouldn't be too difficult to support it though.
+        * Based off the HTTP http_encoding_dechunk function.
         *
         * @link http://tools.ietf.org/html/rfc2616#section-19.4.6 Process for chunked decoding.
         *
-        * @todo Add support for footer chunked headers.
         * @access public
         * @since 2.7.0
         * @static
@@ -446,35 +457,31 @@ class WP_Http {
         * @param string $body Body content
         * @return string Chunked decoded body on success or raw body on failure.
         */
-       function chunkTransferDecode($body) {
-               $body = str_replace(array("\r\n", "\r"), "\n", $body);
-               // The body is not chunked encoding or is malformed.
-               if ( ! preg_match( '/^[0-9a-f]+(\s|\n)+/mi', trim($body) ) )
+       public static function chunkTransferDecode( $body ) {
+               // The body is not chunked encoded or is malformed.
+               if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) )
                        return $body;
 
-               $parsedBody = '';
-               //$parsedHeaders = array(); Unsupported
+               $parsed_body = '';
+               $body_original = $body; // We'll be altering $body, so need a backup in case of error
 
                while ( true ) {
-                       $hasChunk = (bool) preg_match( '/^([0-9a-f]+)(\s|\n)+/mi', $body, $match );
-
-                       if ( $hasChunk ) {
-                               if ( empty( $match[1] ) )
-                                       return $body;
+                       $has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match );
+                       if ( ! $has_chunk || empty( $match[1] ) )
+                               return $body_original;
 
-                               $length = hexdec( $match[1] );
-                               $chunkLength = strlen( $match[0] );
+                       $length = hexdec( $match[1] );
+                       $chunk_length = strlen( $match[0] );
 
-                               $strBody = substr($body, $chunkLength, $length);
-                               $parsedBody .= $strBody;
+                       // Parse out the chunk of data
+                       $parsed_body .= substr( $body, $chunk_length, $length );
 
-                               $body = ltrim(str_replace(array($match[0], $strBody), '', $body), "\n");
+                       // Remove the chunk from the raw data
+                       $body = substr( $body, $length + $chunk_length );
 
-                               if ( "0" == trim($body) )
-                                       return $parsedBody; // Ignore footer headers.
-                       } else {
-                               return $body;
-                       }
+                       // End of document
+                       if ( '0' === trim( $body ) )
+                               return $parsed_body;
                }
        }
 
@@ -502,19 +509,9 @@ class WP_Http {
                if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
                        return false;
 
-               // parse_url() only handles http, https type URLs, and will emit E_WARNING on failure.
-               // This will be displayed on blogs, which is not reasonable.
-               $check = @parse_url($uri);
-
-               /* Malformed URL, can not process, but this could mean ssl, so let through anyway.
-                *
-                * This isn't very security sound. There are instances where a hacker might attempt
-                * to bypass the proxy and this check. However, the reason for this behavior is that
-                * WordPress does not do any checking currently for non-proxy requests, so it is keeps with
-                * the default unsecure nature of the HTTP request.
-                */
-               if ( $check === false )
-                       return false;
+               $check = parse_url($uri);
+               if ( ! $check )
+                       return true;
 
                $home = parse_url( get_option('siteurl') );
 
@@ -533,7 +530,7 @@ class WP_Http {
                        if ( false !== strpos(WP_ACCESSIBLE_HOSTS, '*') ) {
                                $wildcard_regex = array();
                                foreach ( $accessible_hosts as $host )
-                                       $wildcard_regex[] = str_replace('\*', '[\w.]+?', preg_quote($host, '/'));
+                                       $wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
                                $wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
                        }
                }
@@ -593,30 +590,104 @@ class WP_Http {
 
                return $absolute_path . '/' . ltrim( $path, '/' );
        }
+
+       /**
+        * Handles HTTP Redirects and follows them if appropriate.
+        *
+        * @since 3.7.0
+        *
+        * @param string $url The URL which was requested.
+        * @param array $args The Arguements which were used to make the request.
+        * @param array $response The Response of the HTTP request.
+        * @return false|object False if no redirect is present, a WP_HTTP or WP_Error result otherwise.
+        */
+       static function handle_redirects( $url, $args, $response ) {
+               // If no redirects are present, or, redirects were not requested, perform no action.
+               if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
+                       return false;
+
+               // Only perform redirections on redirection http codes
+               if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
+                       return false;
+
+               // Don't redirect if we've run out of redirects
+               if ( $args['redirection']-- <= 0 )
+                       return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+
+               $redirect_location = $response['headers']['location'];
+
+               // If there were multiple Location headers, use the last header specified
+               if ( is_array( $redirect_location ) )
+                       $redirect_location = array_pop( $redirect_location );
+
+               $redirect_location = WP_HTTP::make_absolute_url( $redirect_location, $url );
+
+               // POST requests should not POST to a redirected location
+               if ( 'POST' == $args['method'] ) {
+                       if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
+                               $args['method'] = 'GET';
+               }
+
+               // Include valid cookies in the redirect process
+               if ( ! empty( $response['cookies'] ) ) {
+                       foreach ( $response['cookies'] as $cookie ) {
+                               if ( $cookie->test( $redirect_location ) )
+                                       $args['cookies'][] = $cookie;
+                       }
+               }
+
+               return wp_remote_request( $redirect_location, $args );
+       }
+
+       /**
+        * Determines if a specified string represents an IP address or not.
+        *
+        * This function also detects the type of the IP address, returning either
+        * '4' or '6' to represent a IPv4 and IPv6 address respectively.
+        * This does not verify if the IP is a valid IP, only that it appears to be
+        * an IP address.
+        *
+        * @see http://home.deds.nl/~aeron/regex/ for IPv6 regex
+        *
+        * @since 3.7.0
+        * @static
+        *
+        * @param string $maybe_ip A suspected IP address
+        * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
+        */
+       static function is_ip_address( $maybe_ip ) {
+               if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) )
+                       return 4;
+
+               if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) )
+                       return 6;
+
+               return false;
+       }
+
 }
 
 /**
- * HTTP request method uses fsockopen function to retrieve the url.
- *
- * This would be the preferred method, but the fsockopen implementation has the most overhead of all
- * the HTTP transport implementations.
+ * HTTP request method uses PHP Streams to retrieve the url.
  *
  * @package WordPress
  * @subpackage HTTP
+ *
  * @since 2.7.0
+ * @since 3.7.0 Combined with the fsockopen transport and switched to stream_socket_client().
  */
-class WP_Http_Fsockopen {
+class WP_Http_Streams {
        /**
-        * Send a HTTP request to a URI using fsockopen().
-        *
-        * Does not support non-blocking mode.
+        * Send a HTTP request to a URI using PHP Streams.
         *
         * @see WP_Http::request For default options descriptions.
         *
-        * @since 2.7
+        * @since 2.7.0
+        * @since 3.7.0 Combined with the fsockopen transport and switched to stream_socket_client().
+        *
         * @access public
         * @param string $url URI resource.
-        * @param str|array $args Optional. Override the defaults.
+        * @param string|array $args Optional. Override the defaults.
         * @return array 'headers', 'body', 'response', 'cookies' and 'filename' keys.
         */
        function request($url, $args = array()) {
@@ -640,18 +711,13 @@ class WP_Http_Fsockopen {
                // Construct Cookie: header if any cookies are set
                WP_Http::buildCookieHeader( $r );
 
-               $iError = null; // Store error number
-               $strError = null; // Store error string
-
                $arrURL = parse_url($url);
 
-               $fsockopen_host = $arrURL['host'];
-
-               $secure_transport = false;
+               $connect_host = $arrURL['host'];
 
+               $secure_transport = ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' );
                if ( ! isset( $arrURL['port'] ) ) {
-                       if ( ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' ) && extension_loaded('openssl') ) {
-                               $fsockopen_host = "ssl://$fsockopen_host";
+                       if ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' ) {
                                $arrURL['port'] = 443;
                                $secure_transport = true;
                        } else {
@@ -659,45 +725,82 @@ class WP_Http_Fsockopen {
                        }
                }
 
-               //fsockopen has issues with 'localhost' with IPv6 with certain versions of PHP, It attempts to connect to ::1,
+               if ( isset( $r['headers']['Host'] ) || isset( $r['headers']['host'] ) ) {
+                       if ( isset( $r['headers']['Host'] ) )
+                               $arrURL['host'] = $r['headers']['Host'];
+                       else
+                               $arrURL['host'] = $r['headers']['host'];
+                       unset( $r['headers']['Host'], $r['headers']['host'] );
+               }
+
+               // Certain versions of PHP have issues with 'localhost' and IPv6, It attempts to connect to ::1,
                // which fails when the server is not set up for it. For compatibility, always connect to the IPv4 address.
-               if ( 'localhost' == strtolower($fsockopen_host) )
-                       $fsockopen_host = '127.0.0.1';
+               if ( 'localhost' == strtolower( $connect_host ) )
+                       $connect_host = '127.0.0.1';
 
-               // There are issues with the HTTPS and SSL protocols that cause errors that can be safely
-               // ignored and should be ignored.
-               if ( true === $secure_transport )
-                       $error_reporting = error_reporting(0);
+               $connect_host = $secure_transport ? 'ssl://' . $connect_host : 'tcp://' . $connect_host;
 
-               $startDelay = time();
+               $is_local = isset( $r['local'] ) && $r['local'];
+               $ssl_verify = isset( $r['sslverify'] ) && $r['sslverify'];
+               if ( $is_local )
+                       $ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify );
+               elseif ( ! $is_local )
+                       $ssl_verify = apply_filters( 'https_ssl_verify', $ssl_verify );
 
                $proxy = new WP_HTTP_Proxy();
 
+               $context = stream_context_create( array(
+                       'ssl' => array(
+                               'verify_peer' => $ssl_verify,
+                               //'CN_match' => $arrURL['host'], // This is handled by self::verify_ssl_certificate()
+                               'capture_peer_cert' => $ssl_verify,
+                               'SNI_enabled' => true,
+                               'cafile' => $r['sslcertificates'],
+                               'allow_self_signed' => ! $ssl_verify,
+                       )
+               ) );
+
+               $timeout = (int) floor( $r['timeout'] );
+               $utimeout = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000;
+               $connect_timeout = max( $timeout, 1 );
+
+               $connection_error = null; // Store error number
+               $connection_error_str = null; // Store error string
+
                if ( !WP_DEBUG ) {
+                       // In the event that the SSL connection fails, silence the many PHP Warnings
+                       if ( $secure_transport )
+                               $error_reporting = error_reporting(0);
+
                        if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-                               $handle = @fsockopen( $proxy->host(), $proxy->port(), $iError, $strError, $r['timeout'] );
+                               $handle = @stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
                        else
-                               $handle = @fsockopen( $fsockopen_host, $arrURL['port'], $iError, $strError, $r['timeout'] );
+                               $handle = @stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+
+                       if ( $secure_transport )
+                               error_reporting( $error_reporting );
+
                } else {
                        if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-                               $handle = fsockopen( $proxy->host(), $proxy->port(), $iError, $strError, $r['timeout'] );
+                               $handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
                        else
-                               $handle = fsockopen( $fsockopen_host, $arrURL['port'], $iError, $strError, $r['timeout'] );
+                               $handle = stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
                }
 
-               $endDelay = time();
+               if ( false === $handle ) {
+                       // SSL connection failed due to expired/invalid cert, or, OpenSSL configuration is broken
+                       if ( $secure_transport && 0 === $connection_error && '' === $connection_error_str )
+                               return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
 
-               // If the delay is greater than the timeout then fsockopen shouldn't be used, because it will
-               // cause a long delay.
-               $elapseDelay = ($endDelay-$startDelay) > $r['timeout'];
-               if ( true === $elapseDelay )
-                       add_option( 'disable_fsockopen', $endDelay, null, true );
+                       return new WP_Error('http_request_failed', $connection_error . ': ' . $connection_error_str );
+               }
 
-               if ( false === $handle )
-                       return new WP_Error('http_request_failed', $iError . ': ' . $strError);
+               // Verify that the SSL certificate is valid for this request
+               if ( $secure_transport && $ssl_verify && ! $proxy->is_enabled() ) {
+                       if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) )
+                               return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+               }
 
-               $timeout = (int) floor( $r['timeout'] );
-               $utimeout = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000;
                stream_set_timeout( $handle, $timeout, $utimeout );
 
                if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) //Some proxies require full URL in this field.
@@ -736,7 +839,8 @@ class WP_Http_Fsockopen {
                fwrite($handle, $strHeaders);
 
                if ( ! $r['blocking'] ) {
-                       fclose($handle);
+                       stream_set_blocking( $handle, 0 );
+                       fclose( $handle );
                        return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
                }
 
@@ -770,10 +874,20 @@ class WP_Http_Fsockopen {
                                        }
                                }
 
-                               if ( isset( $r['limit_response_size'] ) && ( $bytes_written + strlen( $block ) ) > $r['limit_response_size'] )
+                               $this_block_size = strlen( $block );
+
+                               if ( isset( $r['limit_response_size'] ) && ( $bytes_written + $this_block_size ) > $r['limit_response_size'] )
                                        $block = substr( $block, 0, ( $r['limit_response_size'] - $bytes_written ) );
 
-                               $bytes_written += fwrite( $stream_handle, $block );
+                               $bytes_written_to_file = fwrite( $stream_handle, $block );
+
+                               if ( $bytes_written_to_file != $this_block_size ) {
+                                       fclose( $handle );
+                                       fclose( $stream_handle );
+                                       return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
+                               }
+
+                               $bytes_written += $bytes_written_to_file;
 
                                $keep_reading = !isset( $r['limit_response_size'] ) || $bytes_written < $r['limit_response_size'];
                        }
@@ -799,19 +913,19 @@ class WP_Http_Fsockopen {
 
                fclose( $handle );
 
-               if ( true === $secure_transport )
-                       error_reporting($error_reporting);
+               $arrHeaders = WP_Http::processHeaders( $process['headers'], $url );
 
-               $arrHeaders = WP_Http::processHeaders( $process['headers'] );
+               $response = array(
+                       'headers' => $arrHeaders['headers'],
+                       'body' => null, // Not yet processed
+                       'response' => $arrHeaders['response'],
+                       'cookies' => $arrHeaders['cookies'],
+                       'filename' => $r['filename']
+               );
 
-               // If location is found, then assume redirect and redirect to location.
-               if ( isset($arrHeaders['headers']['location']) && 0 !== $r['_redirection'] ) {
-                       if ( $r['redirection']-- > 0 ) {
-                               return wp_remote_request( WP_HTTP::make_absolute_url( $arrHeaders['headers']['location'], $url ), $r);
-                       } else {
-                               return new WP_Error('http_request_failed', __('Too many redirects.'));
-                       }
-               }
+               // Handle redirects
+               if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+                       return $redirect_response;
 
                // If the body was chunk encoded, then decode it.
                if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] )
@@ -823,193 +937,70 @@ class WP_Http_Fsockopen {
                if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] )
                        $process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
 
-               return array( 'headers' => $arrHeaders['headers'], 'body' => $process['body'], 'response' => $arrHeaders['response'], 'cookies' => $arrHeaders['cookies'], 'filename' => $r['filename'] );
+               $response['body'] = $process['body'];
+
+               return $response;
        }
 
        /**
-        * Whether this class can be used for retrieving an URL.
+        * Verifies the received SSL certificate against it's Common Names and subjectAltName fields
         *
-        * @since 2.7.0
+        * PHP's SSL verifications only verify that it's a valid Certificate, it doesn't verify if
+        * the certificate is valid for the hostname which was requested.
+        * This function verifies the requested hostname against certificate's subjectAltName field,
+        * if that is empty, or contains no DNS entries, a fallback to the Common Name field is used.
+        *
+        * IP Address support is included if the request is being made to an IP address.
+        *
+        * @since 3.7.0
         * @static
-        * @return boolean False means this class can not be used, true means it can.
+        *
+        * @param stream $stream The PHP Stream which the SSL request is being made over
+        * @param string $host The hostname being requested
+        * @return bool If the cerficiate presented in $stream is valid for $host
         */
-       public static function test( $args = array() ) {
-               if ( ! function_exists( 'fsockopen' ) )
-                       return false;
+       static function verify_ssl_certificate( $stream, $host ) {
+               $context_options = stream_context_get_options( $stream );
 
-               if ( false !== ( $option = get_option( 'disable_fsockopen' ) ) && time() - $option < 12 * HOUR_IN_SECONDS )
+               if ( empty( $context_options['ssl']['peer_certificate'] ) )
                        return false;
 
-               $is_ssl = isset( $args['ssl'] ) && $args['ssl'];
-
-               if ( $is_ssl && ! extension_loaded( 'openssl' ) )
+               $cert = openssl_x509_parse( $context_options['ssl']['peer_certificate'] );
+               if ( ! $cert )
                        return false;
 
-               return apply_filters( 'use_fsockopen_transport', true, $args );
-       }
-}
+               // If the request is being made to an IP address, we'll validate against IP fields in the cert (if they exist)
+               $host_type = ( WP_HTTP::is_ip_address( $host ) ? 'ip' : 'dns' );
 
-/**
- * HTTP request method uses Streams to retrieve the url.
- *
- * Requires PHP 5.0+ and uses fopen with stream context. Requires that 'allow_url_fopen' PHP setting
- * to be enabled.
- *
- * Second preferred method for getting the URL, for PHP 5.
- *
- * @package WordPress
- * @subpackage HTTP
- * @since 2.7.0
- */
-class WP_Http_Streams {
-       /**
-        * Send a HTTP request to a URI using streams with fopen().
-        *
-        * @access public
-        * @since 2.7.0
-        *
-        * @param string $url
-        * @param str|array $args Optional. Override the defaults.
-        * @return array 'headers', 'body', 'response', 'cookies' and 'filename' keys.
-        */
-       function request($url, $args = array()) {
-               $defaults = array(
-                       'method' => 'GET', 'timeout' => 5,
-                       'redirection' => 5, 'httpversion' => '1.0',
-                       'blocking' => true,
-                       'headers' => array(), 'body' => null, 'cookies' => array()
-               );
-
-               $r = wp_parse_args( $args, $defaults );
-
-               if ( isset($r['headers']['User-Agent']) ) {
-                       $r['user-agent'] = $r['headers']['User-Agent'];
-                       unset($r['headers']['User-Agent']);
-               } else if ( isset($r['headers']['user-agent']) ) {
-                       $r['user-agent'] = $r['headers']['user-agent'];
-                       unset($r['headers']['user-agent']);
-               }
-
-               // Construct Cookie: header if any cookies are set
-               WP_Http::buildCookieHeader( $r );
-
-               $arrURL = parse_url($url);
-
-               if ( false === $arrURL )
-                       return new WP_Error('http_request_failed', sprintf(__('Malformed URL: %s'), $url));
-
-               if ( 'http' != $arrURL['scheme'] && 'https' != $arrURL['scheme'] )
-                       $url = preg_replace('|^' . preg_quote($arrURL['scheme'], '|') . '|', 'http', $url);
-
-               // Convert Header array to string.
-               $strHeaders = '';
-               if ( is_array( $r['headers'] ) )
-                       foreach ( $r['headers'] as $name => $value )
-                               $strHeaders .= "{$name}: $value\r\n";
-               else if ( is_string( $r['headers'] ) )
-                       $strHeaders = $r['headers'];
-
-               $is_local = isset($args['local']) && $args['local'];
-               $ssl_verify = isset($args['sslverify']) && $args['sslverify'];
-               if ( $is_local )
-                       $ssl_verify = apply_filters('https_local_ssl_verify', $ssl_verify);
-               elseif ( ! $is_local )
-                       $ssl_verify = apply_filters('https_ssl_verify', $ssl_verify);
-
-               $arrContext = array('http' =>
-                       array(
-                               'method' => strtoupper($r['method']),
-                               'user_agent' => $r['user-agent'],
-                               'max_redirects' => 0, // Follow no redirects
-                               'follow_redirects' => false,
-                               'protocol_version' => (float) $r['httpversion'],
-                               'header' => $strHeaders,
-                               'ignore_errors' => true, // Return non-200 requests.
-                               'timeout' => $r['timeout'],
-                               'ssl' => array(
-                                               'verify_peer' => $ssl_verify,
-                                               'verify_host' => $ssl_verify
-                               )
-                       )
-               );
-
-               $proxy = new WP_HTTP_Proxy();
-
-               if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
-                       $arrContext['http']['proxy'] = 'tcp://' . $proxy->host() . ':' . $proxy->port();
-                       $arrContext['http']['request_fulluri'] = true;
-
-                       // We only support Basic authentication so this will only work if that is what your proxy supports.
-                       if ( $proxy->use_authentication() )
-                               $arrContext['http']['header'] .= $proxy->authentication_header() . "\r\n";
-               }
-
-               if ( ! is_null( $r['body'] ) )
-                       $arrContext['http']['content'] = $r['body'];
-
-               $context = stream_context_create($arrContext);
-
-               if ( !WP_DEBUG )
-                       $handle = @fopen($url, 'r', false, $context);
-               else
-                       $handle = fopen($url, 'r', false, $context);
-
-               if ( ! $handle )
-                       return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
-
-               $timeout = (int) floor( $r['timeout'] );
-               $utimeout = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000;
-               stream_set_timeout( $handle, $timeout, $utimeout );
-
-               if ( ! $r['blocking'] ) {
-                       stream_set_blocking($handle, 0);
-                       fclose($handle);
-                       return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
-               }
-
-               $max_bytes = isset( $r['limit_response_size'] ) ? intval( $r['limit_response_size'] ) : -1;
-               if ( $r['stream'] ) {
-                       if ( ! WP_DEBUG )
-                               $stream_handle = @fopen( $r['filename'], 'w+' );
-                       else
-                               $stream_handle = fopen( $r['filename'], 'w+' );
-
-                       if ( ! $stream_handle )
-                               return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
-
-                       stream_copy_to_stream( $handle, $stream_handle, $max_bytes );
-
-                       fclose( $stream_handle );
-                       $strResponse = '';
-               } else {
-                       $strResponse = stream_get_contents( $handle, $max_bytes );
+               $certificate_hostnames = array();
+               if ( ! empty( $cert['extensions']['subjectAltName'] ) ) {
+                       $match_against = preg_split( '/,\s*/', $cert['extensions']['subjectAltName'] );
+                       foreach ( $match_against as $match ) {
+                               list( $match_type, $match_host ) = explode( ':', $match );
+                               if ( $host_type == strtolower( trim( $match_type ) ) ) // IP: or DNS:
+                                       $certificate_hostnames[] = strtolower( trim( $match_host ) );
+                       }
+               } elseif ( !empty( $cert['subject']['CN'] ) ) {
+                       // Only use the CN when the certificate includes no subjectAltName extension
+                       $certificate_hostnames[] = strtolower( $cert['subject']['CN'] );
                }
 
-               $meta = stream_get_meta_data( $handle );
-
-               fclose( $handle );
-
-               $processedHeaders = array();
-               if ( isset( $meta['wrapper_data']['headers'] ) )
-                       $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']['headers']);
-               else
-                       $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']);
+               // Exact hostname/IP matches
+               if ( in_array( strtolower( $host ), $certificate_hostnames ) )
+                       return true;
 
-               if ( ! empty( $processedHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections
-                       if ( $r['redirection']-- > 0 ) {
-                               return wp_remote_request( WP_HTTP::make_absolute_url( $processedHeaders['headers']['location'], $url ), $r );
-                       } else {
-                               return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
-                       }
-               }
+               // IP's can't be wildcards, Stop processing
+               if ( 'ip' == $host_type )
+                       return false;
 
-               if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] )
-                       $strResponse = WP_Http::chunkTransferDecode($strResponse);
+               // Test to see if the domain is at least 2 deep for wildcard support
+               if ( substr_count( $host, '.' ) < 2 )
+                       return false;
 
-               if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($processedHeaders['headers']) )
-                       $strResponse = WP_Http_Encoding::decompress( $strResponse );
+               // Wildcard subdomains certs (*.example.com) are valid for a.example.com but not a.b.example.com
+               $wildcard_host = preg_replace( '/^[^.]+\./', '*.', $host );
 
-               return array( 'headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response'], 'cookies' => $processedHeaders['cookies'], 'filename' => $r['filename'] );
+               return in_array( strtolower( $wildcard_host ), $certificate_hostnames );
        }
 
        /**
@@ -1018,25 +1009,45 @@ class WP_Http_Streams {
         * @static
         * @access public
         * @since 2.7.0
+        * @since 3.7.0 Combined with the fsockopen transport and switched to stream_socket_client().
         *
         * @return boolean False means this class can not be used, true means it can.
         */
        public static function test( $args = array() ) {
-               if ( ! function_exists( 'fopen' ) )
-                       return false;
-
-               if ( ! function_exists( 'ini_get' ) || true != ini_get( 'allow_url_fopen' ) )
+               if ( ! function_exists( 'stream_socket_client' ) )
                        return false;
 
                $is_ssl = isset( $args['ssl'] ) && $args['ssl'];
 
-               if ( $is_ssl && ! extension_loaded( 'openssl' ) )
-                       return false;
+               if ( $is_ssl ) {
+                       if ( ! extension_loaded( 'openssl' ) )
+                               return false;
+                       if ( ! function_exists( 'openssl_x509_parse' ) )
+                               return false;
+               }
 
                return apply_filters( 'use_streams_transport', true, $args );
        }
 }
 
+/**
+ * Deprecated HTTP Transport method which used fsockopen.
+ *
+ * This class is not used, and is included for backwards compatibility only.
+ * All code should make use of WP_HTTP directly through it's API.
+ *
+ * @see WP_HTTP::request
+ *
+ * @package WordPress
+ * @subpackage HTTP
+ *
+ * @since 2.7.0
+ * @deprecated 3.7.0 Please use WP_HTTP::request() directly
+ */
+class WP_HTTP_Fsockopen extends WP_HTTP_Streams {
+       // For backwards compatibility for users who are using the class directly
+}
+
 /**
  * HTTP request method uses Curl extension to retrieve the url.
  *
@@ -1044,7 +1055,7 @@ class WP_Http_Streams {
  *
  * @package WordPress
  * @subpackage HTTP
- * @since 2.7
+ * @since 2.7.0
  */
 class WP_Http_Curl {
 
@@ -1149,6 +1160,7 @@ class WP_Http_Curl {
                curl_setopt( $handle, CURLOPT_RETURNTRANSFER, true );
                curl_setopt( $handle, CURLOPT_SSL_VERIFYHOST, ( $ssl_verify === true ) ? 2 : false );
                curl_setopt( $handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify );
+               curl_setopt( $handle, CURLOPT_CAINFO, $r['sslcertificates'] );
                curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] );
                // The option doesn't work with safe mode or when open_basedir is set, and there's a
                // bug #17490 with redirected POST requests, so handle redirections outside Curl.
@@ -1235,14 +1247,20 @@ class WP_Http_Curl {
                }
 
                $theResponse = curl_exec( $handle );
-               $theHeaders = WP_Http::processHeaders( $this->headers );
+               $theHeaders = WP_Http::processHeaders( $this->headers, $url );
                $theBody = $this->body;
 
                $this->headers = '';
                $this->body = '';
 
-               // If no response
-               if ( 0 == strlen( $theBody ) && empty( $theHeaders['headers'] ) ) {
+               $curl_error = curl_errno( $handle );
+
+               // If an error occured, or, no response
+               if ( $curl_error || ( 0 == strlen( $theBody ) && empty( $theHeaders['headers'] ) ) ) {
+                       if ( CURLE_WRITE_ERROR /* 23 */ == $curl_error &&  $r['stream'] ) {
+                               fclose( $this->stream_handle );
+                               return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
+                       }
                        if ( $curl_error = curl_error( $handle ) ) {
                                curl_close( $handle );
                                return new WP_Error( 'http_request_failed', $curl_error );
@@ -1262,19 +1280,24 @@ class WP_Http_Curl {
                if ( $r['stream'] )
                        fclose( $this->stream_handle );
 
-               // See #11305 - When running under safe mode, redirection is disabled above. Handle it manually.
-               if ( ! empty( $theHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections
-                       if ( $r['redirection']-- > 0 ) {
-                               return wp_remote_request( WP_HTTP::make_absolute_url( $theHeaders['headers']['location'], $url ), $r );
-                       } else {
-                               return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
-                       }
-               }
+               $response = array(
+                       'headers' => $theHeaders['headers'],
+                       'body' => null,
+                       'response' => $response,
+                       'cookies' => $theHeaders['cookies'],
+                       'filename' => $r['filename']
+               );
+
+               // Handle redirects
+               if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+                       return $redirect_response;
 
                if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )
                        $theBody = WP_Http_Encoding::decompress( $theBody );
 
-               return array( 'headers' => $theHeaders['headers'], 'body' => $theBody, 'response' => $response, 'cookies' => $theHeaders['cookies'], 'filename' => $r['filename'] );
+               $response['body'] = $theBody;
+
+               return $response;
        }
 
        /**
@@ -1302,25 +1325,20 @@ class WP_Http_Curl {
         * @return int
         */
        private function stream_body( $handle, $data ) {
-               if ( function_exists( 'ini_get' ) && ( ini_get( 'mbstring.func_overload' ) & 2 ) && function_exists( 'mb_internal_encoding' ) ) {
-                       $mb_encoding = mb_internal_encoding();
-                       mb_internal_encoding( 'ISO-8859-1' );
-               }
+               $data_length = strlen( $data );
 
-               if ( $this->max_body_length && ( strlen( $this->body ) + strlen( $data ) ) > $this->max_body_length )
-                       $data = substr( $data, 0, ( $this->max_body_length - strlen( $this->body ) ) );
+               if ( $this->max_body_length && ( strlen( $this->body ) + $data_length ) > $this->max_body_length )
+                       $data = substr( $data, 0, ( $this->max_body_length - $data_length ) );
 
-               if ( $this->stream_handle )
-                       fwrite( $this->stream_handle, $data );
-               else
+               if ( $this->stream_handle ) {
+                       $bytes_written = fwrite( $this->stream_handle, $data );
+               } else {
                        $this->body .= $data;
+                       $bytes_written = $data_length;
+               }
 
-               $data_length = strlen( $data );
-
-               if ( isset( $mb_encoding ) )
-                       mb_internal_encoding( $mb_encoding );
-
-               return $data_length;
+               // Upon event of this function returning less than strlen( $data ) curl will error with CURLE_WRITE_ERROR
+               return $bytes_written;
        }
 
        /**
@@ -1527,7 +1545,7 @@ class WP_HTTP_Proxy {
                        if ( false !== strpos(WP_PROXY_BYPASS_HOSTS, '*') ) {
                                $wildcard_regex = array();
                                foreach ( $bypass_hosts as $host )
-                                       $wildcard_regex[] = str_replace('\*', '[\w.]+?', preg_quote($host, '/'));
+                                       $wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
                                $wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
                        }
                }
@@ -1606,14 +1624,24 @@ class WP_Http_Cookie {
         * <li>Expires - (optional) String or int (UNIX timestamp).</li>
         * <li>Path (optional)</li>
         * <li>Domain (optional)</li>
+        * <li>Port (optional)</li>
         * </ol>
         *
         * @access public
         * @since 2.8.0
         *
         * @param string|array $data Raw cookie data.
+        * @param string $requested_url The URL which the cookie was set on, used for default 'domain' and 'port' values
         */
-       function __construct( $data ) {
+       function __construct( $data, $requested_url = '' ) {
+               if ( $requested_url )
+                       $arrURL = @parse_url( $requested_url );
+               if ( isset( $arrURL['host'] ) )
+                       $this->domain = $arrURL['host'];
+               $this->path = isset( $arrURL['path'] ) ? $arrURL['path'] : '/';
+               if (  '/' != substr( $this->path, -1 ) )
+                       $this->path = dirname( $this->path ) . '/';
+
                if ( is_string( $data ) ) {
                        // Assume it's a header string direct from a previous request
                        $pairs = explode( ';', $data );
@@ -1642,10 +1670,10 @@ class WP_Http_Cookie {
                                return false;
 
                        // Set properties based directly on parameters
-                       $this->name   = $data['name'];
-                       $this->value  = isset( $data['value'] ) ? $data['value'] : '';
-                       $this->path   = isset( $data['path'] ) ? $data['path'] : '';
-                       $this->domain = isset( $data['domain'] ) ? $data['domain'] : '';
+                       foreach ( array( 'name', 'value', 'path', 'domain', 'port' ) as $field ) {
+                               if ( isset( $data[ $field ] ) )
+                                       $this->$field = $data[ $field ];
+                       }
 
                        if ( isset( $data['expires'] ) )
                                $this->expires = is_int( $data['expires'] ) ? $data['expires'] : strtotime( $data['expires'] );
@@ -1666,18 +1694,21 @@ class WP_Http_Cookie {
         * @return boolean true if allowed, false otherwise.
         */
        function test( $url ) {
+               if ( is_null( $this->name ) )
+                       return false;
+
                // Expires - if expired then nothing else matters
                if ( isset( $this->expires ) && time() > $this->expires )
                        return false;
 
                // Get details on the URL we're thinking about sending to
                $url = parse_url( $url );
-               $url['port'] = isset( $url['port'] ) ? $url['port'] : 80;
+               $url['port'] = isset( $url['port'] ) ? $url['port'] : ( 'https' == $url['scheme'] ? 443 : 80 );
                $url['path'] = isset( $url['path'] ) ? $url['path'] : '/';
 
                // Values to use for comparison against the URL
                $path   = isset( $this->path )   ? $this->path   : '/';
-               $port   = isset( $this->port )   ? $this->port   : 80;
+               $port   = isset( $this->port )   ? $this->port   : null;
                $domain = isset( $this->domain ) ? strtolower( $this->domain ) : strtolower( $url['host'] );
                if ( false === stripos( $domain, '.' ) )
                        $domain .= '.local';
@@ -1688,7 +1719,7 @@ class WP_Http_Cookie {
                        return false;
 
                // Port - supports "port-lists" in the format: "80,8000,8080"
-               if ( !in_array( $url['port'], explode( ',', $port) ) )
+               if ( !empty( $port ) && !in_array( $url['port'], explode( ',', $port) ) )
                        return false;
 
                // Path - request path must start with path restriction