[wp-cvs] wordpress wp-login.php,1.40,1.41

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12201

Modified Files:
	wp-login.php 
Log Message:
Minor header cleanup

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** wp-login.php	10 Oct 2004 18:02:29 -0000	1.40
--- wp-login.php	10 Oct 2004 18:07:33 -0000	1.41
***************
*** 37,41 ****
--- 37,48 ----
  	}
  }
+ 
  $error = '';
+ 
+ header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
+ header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+ header('Cache-Control: no-cache, must-revalidate');
+ header('Pragma: no-cache');
+ 
  // If someone has moved WordPress let's try to detect it
  if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']) != get_settings('siteurl') )
***************
*** 48,55 ****
      setcookie('wordpressuser_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
      setcookie('wordpresspass_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
! 	header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
! 	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
! 	header('Cache-Control: no-cache, must-revalidate');
! 	header('Pragma: no-cache');
  	if ($is_IIS)
  		header('Refresh: 0;url=wp-login.php');
--- 55,59 ----
      setcookie('wordpressuser_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
      setcookie('wordpresspass_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
! 
  	if ($is_IIS)
  		header('Refresh: 0;url=wp-login.php');
***************
*** 149,157 ****
  	}
  
- 	header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
- 	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
- 	header('Cache-Control: no-cache, must-revalidate');
- 	header('Pragma: no-cache');
- 
  	if ( wp_login($log, $pwd) ) {
  		$user_login = $log;
--- 153,156 ----
***************
*** 172,179 ****
  
  	if ( wp_login($user_login, $user_pass_md5, true) ) {
- 		header('Expires: Wed, 5 Jun 1979 23:41:00 GMT'); // Michel's birthday
- 		header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
- 		header('Cache-Control: no-cache, must-revalidate');
- 		header('Pragma: no-cache');
  		header('Location: wp-admin/');
  		exit();
--- 171,174 ----