Changeset 8644

Timestamp:

08/13/2008 11:37:42 PM (18 years ago)

Author:

ryan

Message:

Adds checking for fsockopen to check for WP_DEBUG and silently drop warnings. Adds streams_set_timeout to fsockopen to help prevent long waits. Props santosj. see #7514

Location:

trunk/wp-includes

Files:

• http.php (modified) (3 diffs)
• update.php (modified) (1 diff)

trunk/wp-includes/http.php

@@ -464 +464 @@
                         $error_reporting = error_reporting(0);
 
-                $handle = fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, $r['timeout'] );
+                if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+                        $handle = @fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, $r['timeout'] );
+                else
+                        $handle = fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, $r['timeout'] );
 
                 if ( false === $handle )
                         return new WP_Error('http_request_failed', $iError . ': ' . $strError);
+
+                // WordPress supports PHP 4.3, which has this function. Removed sanity
+                // checking for performance reasons.
+                stream_set_timeout($handle, $r['timeout'] );
 
                 $requestPath = $arrURL['path'] . ( isset($arrURL['query']) ? '?' . $arrURL['query'] : '' );
@@ -602 +609 @@
                         return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
 
-                if ( function_exists('stream_set_timeout') )
-                        stream_set_timeout($handle, $r['timeout'] );
+                // WordPress supports PHP 4.3, which has this function. Removed sanity
+                // checking for performance reasons.
+                stream_set_timeout($handle, $r['timeout'] );
 
                 if ( ! $r['blocking'] ) {
@@ -727 +735 @@
                         return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
 
+                // WordPress supports PHP 4.3, which has this function. Removed sanity
+                // checking for performance reasons.
                 stream_set_timeout($handle, $r['timeout'] );
 

trunk/wp-includes/update.php

@@ -146 +146 @@
         $raw_response = wp_remote_request('http://api.wordpress.org/plugins/update-check/1.0/', $options);
 
+        if ( is_wp_error( $raw_response ) )
+                return false;
+
         if( 200 != $raw_response['response']['code'] ) {
                 return false;