Changeset 9013

Timestamp:

09/27/2008 09:41:19 PM (18 years ago)

Author:

westi

Message:

Move the old simple http method to use the new HTTP api. See #7793 props jacobsantos.

File:

• trunk/wp-includes/functions.php (modified) (6 diffs)

trunk/wp-includes/functions.php

@@ -1022 +1022 @@
  * @since 2.5.0
  *
- * @param string $url
+ * @param string $url URL to fetch.
  * @param string|bool $file_path Optional. File path to write request to.
- * @param int $red Optional. Number of Redirects. Stops at 5 redirects.
+ * @param bool $deprecated Deprecated. Not used.
  * @return bool|string False on failure and string of headers if HEAD request.
  */
-function wp_get_http( $url, $file_path = false, $red = 1 ) {
-        global $wp_version;
+function wp_get_http( $url, $file_path = false, $deprecated = false ) {
         @set_time_limit( 60 );
 
-        if ( $red > 5 )
-                 return false;
-
-        $parts = parse_url( $url );
-        $file = $parts['path'] . ( ( $parts['query'] ) ? '?' . $parts['query'] : '' );
-        $host = $parts['host'];
-        if ( !isset( $parts['port'] ) )
-                $parts['port'] = 80;
-
-        if ( $file_path )
-                $request_type = 'GET';
+        $options = array();
+        $options['redirection'] = 5;
+
+        if ( false == $file_path )
+                $options['method'] = 'HEAD';
         else
-                $request_type = 'HEAD';
-
-        $head = "$request_type $file HTTP/1.1\r\nHOST: $host\r\nUser-Agent: WordPress/" . $wp_version . "\r\n\r\n";
-
-        $fp = @fsockopen( $host, $parts['port'], $err_num, $err_msg, 3 );
-        if ( !$fp )
-                return false;
-
-        $response = '';
-        fputs( $fp, $head );
-        while ( !feof( $fp ) && strpos( $response, "\r\n\r\n" ) == false )
-                $response .= fgets( $fp, 2048 );
-        preg_match_all( '/(.*?): (.*)\r/', $response, $matches );
-        $count = count( $matches[1] );
-        for ( $i = 0; $i < $count; $i++ ) {
-                $key = strtolower( $matches[1][$i] );
-                $headers["$key"] = $matches[2][$i];
-        }
-
-        preg_match( '/.*([0-9]{3}).*/', $response, $return );
-        $headers['response'] = $return[1]; // HTTP response code eg 204, 200, 404
-
-                $code = $headers['response'];
-                if ( ( '302' == $code || '301' == $code ) && isset( $headers['location'] ) ) {
-                                fclose($fp);
-                                return wp_get_http( $headers['location'], $file_path, ++$red );
-                }
-
-        // make a note of the final location, so the caller can tell if we were redirected or not
-        $headers['x-final-location'] = $url;
-
-        // HEAD request only
-        if ( !$file_path ) {
-                fclose($fp);
+                $options['method'] = 'GET';
+
+        $response = wp_remote_request($url, $options);
+
+        $headers = wp_remote_retrieve_headers( $response );
+        if ( false == $file_path )
                 return $headers;
-        }
 
         // GET request - fetch and write it to the supplied filename
-        $content_length = $headers['content-length'];
+        $content_length = isset( $headers['content-length'] ) ? $headers['content-length'] : strlen( $response['body'] );
         $got_bytes = 0;
         $out_fp = fopen($file_path, 'w');
@@ -1094 +1058 @@
 
         fclose($out_fp);
-        fclose($fp);
+
         return $headers;
 }
@@ -1104 +1068 @@
  *
  * @param string $url
- * @param int $red Optional. Number of redirects.
+ * @param bool $deprecated Not Used.
  * @return bool|string False on failure, headers on success.
  */
-function wp_get_http_headers( $url, $red = 1 ) {
-        return wp_get_http( $url, false, $red );
+function wp_get_http_headers( $url, $deprecated = false ) {
+        $response = wp_remote_head( $url );
+        return wp_remote_retrieve_headers( $response );
 }
 
@@ -1272 +1237 @@
  * HTTP request for URI to retrieve content.
  *
- * Tries to retrieve the HTTP content with fopen first and then using cURL, if
- * fopen can't be used.
- *
  * @since 1.5.1
+ * @uses wp_remote_get()
  *
  * @param string $uri URI/URL of web page to retrieve.
@@ -1281 +1244 @@
  */
 function wp_remote_fopen( $uri ) {
-        $timeout = 10;
+        // parse url() should not be used for validation of URLs.
+        // Keeping anyway, since the Filter extension is not available on all servers.
         $parsed_url = @parse_url( $uri );
 
@@ -1287 +1251 @@
                 return false;
 
-        if ( !isset( $parsed_url['scheme'] ) || !in_array( $parsed_url['scheme'], array( 'http','https' ) ) )
-                $uri = 'http://' . $uri;
-
-        if ( ini_get( 'allow_url_fopen' ) ) {
-                $fp = @fopen( $uri, 'r' );
-                if ( !$fp )
-                        return false;
-
-                //stream_set_timeout($fp, $timeout); // Requires php 4.3
-                $linea = '';
-                while ( $remote_read = fread( $fp, 4096 ) )
-                        $linea .= $remote_read;
-                fclose( $fp );
-                return $linea;
-        } elseif ( function_exists( 'curl_init' ) ) {
-                $handle = curl_init();
-                curl_setopt( $handle, CURLOPT_URL, $uri);
-                curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, 1 );
-                curl_setopt( $handle, CURLOPT_RETURNTRANSFER, 1 );
-                curl_setopt( $handle, CURLOPT_TIMEOUT, $timeout );
-                $buffer = curl_exec( $handle );
-                curl_close( $handle );
-                return $buffer;
-        } else {
-                return false;
-        }
+        $options = array();
+        $options['timeout'] = 10;
+
+        $response = wp_remote_get( $uri, $options );
+
+        return $response['body'];
 }