Ticket #5037: 5037.002.diff

wp-includes/update.php

@@ -3 +3 @@
 // A simple set of functions to check our version 1.0 update service
 
 function wp_version_check() {
-        if ( strpos($_SERVER['PHP_SELF'], 'install.php') !== false || defined('WP_INSTALLING') )
+        if ( !function_exists('fsockopen') || strpos($_SERVER['PHP_SELF'], 'install.php') !== false || defined('WP_INSTALLING') )
                 return;
 
         global $wp_version;
@@ -30 +30 @@
         $http_request .= "\r\n";
 
         $response = '';
-        if ( false !== ( $fs = @fsockopen( 'api.wordpress.org', 80, $errno, $errstr, 3 ) ) ) {
+        if ( false !== ( $fs = @fsockopen( 'api.wordpress.org', 80, $errno, $errstr, 3 ) ) && is_resource($fs) ) {
                 fwrite( $fs, $http_request );
                 while ( !feof( $fs ) )
                         $response .= fgets( $fs, 1160 ); // One TCP-IP packet

wp-admin/includes/update.php

@@ -42 +42 @@
 
 function wp_update_plugins() {
         global $wp_version;
+
+        if ( !function_exists('fsockopen') )
+                return false;
+
         $plugins = get_plugins();
         $active  = get_option( 'active_plugins' );
         $current = get_option( 'update_plugins' );
@@ -83 +87 @@
         $http_request .= $request;
 
         $response = '';
-        if( false != ( $fs = @fsockopen( 'api.wordpress.org', 80, $errno, $errstr, 3) ) ) {
+        if( false != ( $fs = @fsockopen( 'api.wordpress.org', 80, $errno, $errstr, 3) ) && is_resource($fs) ) {
                 fwrite($fs, $http_request);
 
                 while ( !feof($fs) )