Ticket #17301: 17301.diff

wp-admin/includes/file.php

@@ -588 +588 @@
                 if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
                         continue;
 
+                do_action( 'keepalive_tick' );
+
                 $parent_folder = dirname($dir);
                 while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
                         $needed_dirs[] = $parent_folder;
@@ -613 +615 @@
                 if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
                         continue;
 
+                do_action( 'keepalive_tick' );
+
                 $contents = $z->getFromIndex($i);
                 if ( false === $contents )
                         return new WP_Error('extract_failed', __('Could not extract file from archive.'), $info['name']);
@@ -690 +694 @@
 
         // Create those directories if need be:
         foreach ( $needed_dirs as $_dir ) {
+                do_action( 'keepalive_tick' );
                 if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the dir exists upon creation failure. Less I/O this way.
                         return new WP_Error('mkdir_failed', __('Could not create directory.'), $_dir);
         }
@@ -703 +708 @@
                 if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
                         continue;
 
+                do_action( 'keepalive_tick' );
+
                 if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
                         return new WP_Error('copy_failed', __('Could not copy file.'), $to . $file['filename']);
         }
@@ -740 +747 @@
                         if ( preg_match($skip_regex, $from . $filename) )
                                 continue;
 
+                do_action( 'keepalive_tick' );
+
                 if ( 'f' == $fileinfo['type'] ) {
                         if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
                                 // If copy failed, chmod file to 0644 and try again.
@@ -1046 +1055 @@
 <?php
         return false;
 }
+
+function connection_keepalive() {
+        if ( ! headers_sent() )
+                return;
+
+        static $last_sent;
+
+        if ( ! isset( $last_sent ) )
+                $last_sent = time();
+
+        // Only send every 10 seconds
+        if ( $last_sent + 10 > time() )
+                return;
+
+        $last_sent = time();
+
+        if ( DOING_AJAX )
+                echo ' '; // It might be JSON, which doesn't allow comments
+        else
+                echo "<!-- $last_sent -->";             
+}
+add_action( 'keepalive_tick', 'connection_keepalive' );

wp-admin/includes/update-core.php

@@ -839 +839 @@
                         if ( preg_match($skip_regex, $from . $filename) )
                                 continue;
 
+                do_action( 'keepalive_tick' );
+
                 if ( 'f' == $fileinfo['type'] ) {
                         if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
                                 // If copy failed, chmod file to 0644 and try again.