Changeset 6151

Timestamp:

09/22/2007 12:08:50 AM (17 years ago)

Author:

markjaquith

Message:

Core and plugin update checking: make sure fsockopen() is available and check file resources with is_resource() -- both to prevent feof() infinite loops. Props xknown. fixes #5037

Location:

trunk

Files:

• wp-admin/includes/update.php (modified) (2 diffs)
• wp-includes/update.php (modified) (2 diffs)

trunk/wp-admin/includes/update.php

@@ -43 +43 @@
 function wp_update_plugins() {
     global $wp_version;
+
+    if ( !function_exists('fsockopen') )
+        return false;
+
     $plugins = get_plugins();
     $active  = get_option( 'active_plugins' );
@@ -84 +88 @@
 
     $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);
 

trunk/wp-includes/update.php

@@ -4 +4 @@
 
 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;
 
@@ -31 +31 @@
 
     $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 ) )