From bee6374953bfed75f06df2f7286160cb51bf42a4 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Wed, 19 Sep 2012 01:51:40 +0000
Subject: [PATCH] Send nocache_headers() in the admin earlier, on the DB
 upgrade page. Prevents a potential redirect loop reproduced in Chrome from
 heavy caching of headers. props mdawaffe. see #21745.

git-svn-id: http://core.svn.wordpress.org/trunk@21913 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin.php   | 4 ++--
 wp-admin/upgrade.php | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 9968bb8cf2..bd2e5406a6 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -29,6 +29,8 @@ if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
 
 require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
 
+nocache_headers();
+
 if ( get_option('db_upgraded') ) {
 	flush_rewrite_rules();
 	update_option( 'db_upgraded',  false );
@@ -66,8 +68,6 @@ require_once(ABSPATH . 'wp-admin/includes/admin.php');
 
 auth_redirect();
 
-nocache_headers();
-
 // Schedule trash collection
 if ( !wp_next_scheduled('wp_scheduled_delete') && !defined('WP_INSTALLING') )
 	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index 6e5d3b8116..8eaaf5f5b3 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -17,6 +17,8 @@ define( 'WP_INSTALLING', true );
 /** Load WordPress Bootstrap */
 require( '../wp-load.php' );
 
+nocache_headers();
+
 timer_start();
 require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );